# # ChangeLog for / in orxonox.OLD # # Generated by Trac 1.0.9 # Nov 11, 2024, 4:47:26 AM Sat, 24 Jun 2006 01:49:33 GMT bensch [8765] * trunk/src/lib/graphics/text_engine/font.cc (modified) * trunk/src/lib/graphics/text_engine/font.h (modified) * trunk/src/lib/graphics/text_engine/font_data.cc (modified) * trunk/src/lib/graphics/text_engine/font_data.h (modified) trunk: much better loading of the Font Sat, 24 Jun 2006 01:12:14 GMT bensch [8764] * trunk/src/lib/graphics/text_engine/font.cc (modified) * trunk/src/lib/graphics/text_engine/font.h (modified) * trunk/src/lib/graphics/text_engine/font_data.cc (modified) * trunk/src/lib/graphics/text_engine/font_data.h (modified) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/graphics/text_engine/text.h (modified) load-implementation of font in font-data Sat, 24 Jun 2006 00:37:58 GMT bensch [8763] * trunk/src/lib/graphics/text_engine/font.cc (modified) * trunk/src/lib/graphics/text_engine/font.h (modified) minor nicer design Sat, 24 Jun 2006 00:16:29 GMT bensch [8762] * branches/fontdata (deleted) deleted merged branche Sat, 24 Jun 2006 00:16:12 GMT bensch [8761] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture.h (modified) * trunk/src/lib/graphics/importer/texture_data.h (modified) * trunk/src/lib/graphics/text_engine/font.cc (modified) * trunk/src/lib/graphics/text_engine/font.h (modified) * trunk/src/lib/graphics/text_engine/font_data.cc (modified) * trunk/src/lib/graphics/text_engine/font_data.h (modified) * trunk/src/lib/graphics/text_engine/limited_width_text.cc (modified) * trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/graphics/text_engine/text.h (modified) * trunk/src/lib/graphics/text_engine/text_engine.cc (modified) * trunk/src/lib/util/count_pointer.h (modified) merged the new Font-Implementation back here merged with svn merge ... Sat, 24 Jun 2006 00:14:37 GMT bensch [8760] * branches/fontdata/src/lib/graphics/text_engine/font.h (modified) * branches/fontdata/src/lib/graphics/text_engine/text.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/text.h (modified) orxonox/font: nicer implementation Fri, 23 Jun 2006 20:25:50 GMT bensch [8759] * branches/fontdata/src/lib/graphics/text_engine/font.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/text.cc (modified) orxonox/trunk: Material Copy constructor as should be Fri, 23 Jun 2006 20:20:35 GMT bensch [8758] * branches/fontdata/src/defs/class_id.h (modified) * branches/fontdata/src/lib/graphics/importer/material.cc (modified) * branches/fontdata/src/lib/graphics/importer/material.h (modified) * branches/fontdata/src/lib/graphics/importer/texture.cc (modified) * branches/fontdata/src/lib/graphics/importer/texture.h (modified) * branches/fontdata/src/lib/graphics/importer/texture_data.h (modified) * branches/fontdata/src/lib/graphics/text_engine/font.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/font.h (modified) * branches/fontdata/src/lib/graphics/text_engine/font_data.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/font_data.h (modified) * branches/fontdata/src/lib/graphics/text_engine/limited_width_text.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/multi_line_text.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/text.cc (modified) font is a Material now Fri, 23 Jun 2006 18:41:13 GMT bensch [8757] * branches/fontdata/src/lib/graphics/text_engine/font.cc (modified) font: looks same as before Fri, 23 Jun 2006 18:34:56 GMT bensch [8756] * branches/fontdata/src/lib/graphics/text_engine/font.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/font.h (modified) * branches/fontdata/src/lib/graphics/text_engine/font_data.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/text.cc (modified) orxonox/font: ok, the font is rendering again Fri, 23 Jun 2006 18:24:28 GMT bensch [8755] * branches/fontdata/src/lib/graphics/text_engine/font.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/font.h (modified) * branches/fontdata/src/lib/graphics/text_engine/text.cc (modified) better with fonts Fri, 23 Jun 2006 16:58:01 GMT bensch [8754] * branches/fontdata/src/lib/graphics/text_engine/font.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/font.h (modified) * branches/fontdata/src/lib/graphics/text_engine/limited_width_text.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/multi_line_text.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/text.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/text.h (modified) * branches/fontdata/src/lib/graphics/text_engine/text_engine.cc (modified) * branches/fontdata/src/lib/util/count_pointer.h (modified) better, but still not running, yet Fri, 23 Jun 2006 16:38:05 GMT bensch [8753] * branches/fontdata/src/lib/graphics/text_engine/font.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/font.h (modified) * branches/fontdata/src/lib/graphics/text_engine/font_data.h (modified) * branches/fontdata/src/lib/graphics/text_engine/text.cc (modified) * branches/fontdata/src/lib/graphics/text_engine/text_engine.cc (modified) orxonox/trunk: non-compiling new Version of the Data-Font Fri, 23 Jun 2006 16:37:30 GMT bensch [8752] * branches/fontdata (copied) new copy Fri, 23 Jun 2006 16:12:07 GMT bensch [8751] * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/graphics/importer/texture_data.h (modified) * trunk/src/lib/graphics/text_engine/font.cc (modified) * trunk/src/lib/graphics/text_engine/font.h (modified) * trunk/src/lib/graphics/text_engine/font_data.cc (copied) * trunk/src/lib/graphics/text_engine/font_data.h (copied) orxonox/trunk: Preparing for FONT-DATA Fri, 23 Jun 2006 15:28:13 GMT bensch [8750] * trunk/src/lib/gui/qt/qt_gui_datadir_fallback.cc (modified) * trunk/src/orxonox.cc (modified) orxonox/trunk: now one can also close orxonox when the datadir is not ... Fri, 23 Jun 2006 15:08:04 GMT bensch [8749] * trunk/src/lib/gui/qt/Makefile.am (modified) * trunk/src/lib/gui/qt/qt_gui_datadir_fallback.cc (copied) * trunk/src/lib/gui/qt/qt_gui_datadir_fallback.h (copied) * trunk/src/orxonox.cc (modified) orxonox/trunk: fallback test for ORXONOX-data-directory Fri, 23 Jun 2006 15:07:04 GMT ponder [8748] * branches/terrain/acinclude.m4 (modified) * branches/terrain/src/lib/collision_detection/cd_engine.cc (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain.cc (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain.h (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain_page.cc (modified) * branches/terrain/src/world_entities/terrain_entity.cc (modified) Small changes to help debug Fri, 23 Jun 2006 14:45:04 GMT ponder [8747] * branches/terrain/acinclude.m4 (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain.h (modified) Added a boundary check to the getAltitude() method Fri, 23 Jun 2006 14:34:14 GMT ponder [8746] * branches/terrain/configure.ac (modified) Removed an if-statement from configure.ac Fri, 23 Jun 2006 14:26:49 GMT ponder [8745] * branches/terrain/src/lib/graphics/importer/terrain/terrain.cc (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain.h (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain_page.cc (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain_page.h (modified) * branches/terrain/src/lib/graphics/importer/terrain/types.h (modified) - Optimized the multi-layer renderings. pages which do not show a ... Fri, 23 Jun 2006 13:22:53 GMT ponder [8744] * branches/terrain/src/lib/graphics/importer/terrain/terrain.cc (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain.h (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain_page.cc (modified) * branches/terrain/src/world_entities/terrain_entity.cc (modified) - A few more properties can be specified in the .oxw file for the ... Fri, 23 Jun 2006 13:17:15 GMT bensch [8743] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/event/event_handler.h (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) gui: event-handler now supports retrieving key-states Fri, 23 Jun 2006 12:55:59 GMT bensch [8742] * trunk/src/lib/graphics/light.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) gui: better switch with keys Fri, 23 Jun 2006 09:29:40 GMT ponder [8741] * branches/terrain/src/lib/collision_detection/cd_engine.cc (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain.cc (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain.h (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain_page.cc (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain_page.h (modified) * branches/terrain/src/world_entities/terrain_entity.cc (modified) * branches/terrain/src/world_entities/terrain_entity.h (modified) - Finally, I got the terrain working completly. What a hard work... ... Fri, 23 Jun 2006 09:22:37 GMT bensch [8740] * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/gui/gl/glgui_button.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/story_entities/menu/glgui_imagebutton.cc (modified) * trunk/src/story_entities/menu/glgui_imagebutton.h (modified) orxonox/trunk: now the elements are draw correctly Fri, 23 Jun 2006 08:59:35 GMT rennerc [8739] * branches/network/src/util/multiplayer_team_deathmatch.cc (modified) * branches/network/src/util/multiplayer_team_deathmatch.h (modified) showing/hiding frags works now Thu, 22 Jun 2006 15:05:44 GMT rennerc [8738] * branches/network/src/util/multiplayer_team_deathmatch.cc (modified) * branches/network/src/util/multiplayer_team_deathmatch.h (modified) started implementing frag table Thu, 22 Jun 2006 14:57:35 GMT snellen [8737] * branches/script_engine/src/world_entities/script_trigger.cc (modified) deleted debug output Thu, 22 Jun 2006 14:55:44 GMT snellen [8736] * branches/script_engine/src/world_entities/script_trigger.cc (modified) deleted debug output Thu, 22 Jun 2006 14:54:55 GMT snellen [8735] * branches/script_engine/src/defs/class_id.h (modified) * branches/script_engine/src/lib/lang/class_list.cc (modified) * branches/script_engine/src/lib/script_engine/script.cc (modified) * branches/script_engine/src/world_entities/script_trigger.cc (modified) * branches/script_engine/src/world_entities/script_trigger.h (modified) * branches/script_engine/src/world_entities/space_ships/helicopter.cc (modified) * branches/script_engine/src/world_entities/space_ships/helicopter.h (modified) script trigger can now be added to a script Thu, 22 Jun 2006 14:50:38 GMT amaechler [8734] * branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/rain_effect.cc (modified) * branches/atmospheric_engine/src/world_entities/skydome.cc (modified) branches/atmospheric_engine: skydome should get reflected Thu, 22 Jun 2006 14:40:28 GMT hdavid [8733] * branches/atmospheric_engine/src/lib/graphics/effects/cloud_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/cloud_effect.h (modified) branches/atmospheric_engine: Thu, 22 Jun 2006 14:33:19 GMT hdavid [8732] * branches/atmospheric_engine/src/world_entities/skydome.cc (added) * branches/atmospheric_engine/src/world_entities/skydome.h (added) Thu, 22 Jun 2006 14:28:18 GMT bensch [8731] * trunk/src/lib/math/quaternion.cc (modified) * trunk/src/lib/math/quaternion.h (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/creatures/fps_player.h (modified) new player Thu, 22 Jun 2006 14:19:27 GMT hdavid [8730] * branches/atmospheric_engine/src/defs/class_id.h (modified) * branches/atmospheric_engine/src/lib/graphics/effects/cloud_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/cloud_effect.h (modified) * branches/atmospheric_engine/src/world_entities/WorldEntities.am (modified) branches/atmospheric_engine: created skydome.[h,cc] Thu, 22 Jun 2006 13:49:22 GMT stefalie [8729] * branches/water/src/world_entities/environments/mapped_water.cc (modified) * branches/water/src/world_entities/environments/mapped_water.h (modified) water: quite everything works... Thu, 22 Jun 2006 13:44:08 GMT rennerc [8728] * branches/network/src/lib/network/netdefs.h (modified) networkfrequency*=2 Thu, 22 Jun 2006 13:17:53 GMT rennerc [8727] * branches/network/src/lib/network/udp_server_socket.cc (modified) * branches/network/src/lib/network/udp_server_socket.h (modified) server identifies user by his random byte Thu, 22 Jun 2006 13:15:54 GMT bensch [8726] * branches/bsp_model (copied) new copy Thu, 22 Jun 2006 13:15:35 GMT bensch [8725] * branches/bsp_model (deleted) delete merged branche Thu, 22 Jun 2006 13:14:58 GMT bensch [8724] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/collision_detection/Makefile.am (modified) * trunk/src/lib/collision_detection/aabb.cc (copied) * trunk/src/lib/collision_detection/aabb.h (copied) * trunk/src/lib/collision_detection/aabb_tree_node.cc (copied) * trunk/src/lib/collision_detection/aabb_tree_node.h (copied) * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.h (modified) * trunk/src/lib/event/key_mapper.cc (modified) * trunk/src/lib/event/key_mapper.h (modified) * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/bsp_manager.h (modified) * trunk/src/lib/graphics/importer/interactive_model.h (modified) * trunk/src/lib/graphics/importer/md2/md2Model.h (modified) * trunk/src/lib/graphics/importer/md3/md3_animation.cc (modified) * trunk/src/lib/graphics/importer/md3/md3_animation.h (modified) * trunk/src/lib/graphics/importer/md3/md3_animation_cfg.cc (copied) * trunk/src/lib/graphics/importer/md3/md3_animation_cfg.h (copied) * trunk/src/lib/graphics/importer/md3/md3_bone_frame.h (modified) * trunk/src/lib/graphics/importer/md3/md3_data.cc (modified) * trunk/src/lib/graphics/importer/md3/md3_data.h (modified) * trunk/src/lib/graphics/importer/md3/md3_mesh.h (modified) * trunk/src/lib/graphics/importer/md3/md3_model.cc (modified) * trunk/src/lib/graphics/importer/md3/md3_model.h (modified) * trunk/src/lib/math/quaternion.cc (modified) * trunk/src/lib/math/quaternion.h (modified) * trunk/src/lib/util/Makefile.am (modified) * trunk/src/lib/util/loading/resource_manager.cc (modified) * trunk/src/lib/util/loading/resource_manager.h (modified) * trunk/src/lib/util/tokenizer.cc (copied) * trunk/src/lib/util/tokenizer.h (copied) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/creatures/fps_player.cc (copied) * trunk/src/world_entities/creatures/fps_player.h (copied) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/creatures/md2_creature.h (modified) * trunk/src/world_entities/npcs/generic_npc.cc (copied) * trunk/src/world_entities/npcs/generic_npc.h (copied) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/npc.h (modified) * trunk/src/world_entities/npcs/npc_test.cc (modified) * trunk/src/world_entities/npcs/npc_test1.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/space_ships/collision_probe.cc (modified) * trunk/src/world_entities/test_entity.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) merged the bsp-model-stuff back here Thu, 22 Jun 2006 12:58:47 GMT rennerc [8723] * branches/network/src/lib/network/udp_server_socket.cc (modified) * branches/network/src/lib/network/udp_socket.cc (modified) * branches/network/src/lib/network/udp_socket.h (modified) added status byte to all packets 2 status bits and 6 random bits Thu, 22 Jun 2006 12:22:23 GMT bensch [8722] * branches/script_engine (copied) new copy Thu, 22 Jun 2006 12:13:57 GMT bensch [8721] * branches/water (copied) new copy Thu, 22 Jun 2006 12:13:38 GMT bensch [8720] * branches/water (deleted) delete Thu, 22 Jun 2006 12:13:18 GMT bensch [8719] * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/environments/mapped_water.h (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) merged the water branche back. conflicts resolved in favour of the trunk Thu, 22 Jun 2006 12:04:54 GMT bensch [8718] * branches/gui (deleted) delete gui Thu, 22 Jun 2006 12:04:28 GMT bensch [8717] * trunk/src/defs/class_id.h (modified) * trunk/src/defs/error.h (modified) * trunk/src/lib/data/data_tank.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/gui/gl/Makefile.am (modified) * trunk/src/lib/gui/gl/glgui_box.cc (modified) * trunk/src/lib/gui/gl/glgui_button.cc (modified) * trunk/src/lib/gui/gl/glgui_button.h (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.h (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.h (modified) * trunk/src/lib/gui/gl/glgui_inputline.cc (modified) * trunk/src/lib/gui/gl/glgui_pushbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_pushbutton.h (modified) * trunk/src/lib/gui/gl/glgui_slider.cc (modified) * trunk/src/lib/gui/gl/glgui_slider.h (modified) * trunk/src/lib/gui/gl/glgui_table.cc (modified) * trunk/src/lib/gui/gl/glgui_table.h (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/util/loading/game_loader.cc (modified) * trunk/src/story_entities/Makefile.am (modified) * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/story_entities/menu (copied) * trunk/src/story_entities/menu/game_menu.cc (copied) * trunk/src/story_entities/menu/game_menu.h (copied) * trunk/src/story_entities/menu/glgui_imagebutton.cc (copied) * trunk/src/story_entities/menu/glgui_imagebutton.h (copied) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/story_entities/single_player_world_data.cc (modified) * trunk/src/story_entities/story_entity.h (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) merged the gui back Thu, 22 Jun 2006 11:57:16 GMT amaechler [8716] * branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.h (modified) * branches/atmospheric_engine/src/lib/graphics/effects/lightening_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/rain_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/snow_effect.cc (modified) * branches/atmospheric_engine/src/world_entities/effects/lightning_bolt.cc (modified) branches/atmospheric_engine: FogFade finally fixed Thu, 22 Jun 2006 11:51:50 GMT ponder [8715] * branches/terrain/acinclude.m4 (modified) * branches/terrain/configure.ac (modified) * branches/terrain/src/lib/collision_detection/cd_engine.cc (modified) * branches/terrain/src/lib/graphics/effects/volfog_effect.cc (modified) * branches/terrain/src/lib/graphics/graphics_engine.cc (modified) * branches/terrain/src/lib/graphics/importer/Makefile.am (modified) * branches/terrain/src/lib/graphics/importer/md2/md2Model.cc (modified) - Added special checks for macosx to acinclude.m4 and configure.ac. ... Thu, 22 Jun 2006 11:40:09 GMT bottac [8714] * branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc (modified) * branches/bsp_model/src/lib/graphics/importer/bsp_manager.h (modified) * branches/bsp_model/src/story_entities/game_world.cc (modified) * branches/bsp_model/src/world_entities/creatures/md2_creature.cc (modified) * branches/bsp_model/src/world_entities/playable.cc (modified) Ground walk Thu, 22 Jun 2006 11:11:41 GMT hdavid [8713] * branches/atmospheric_engine/src/lib/graphics/effects/cloud_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/cloud_effect.h (modified) * branches/atmospheric_engine/src/lib/graphics/effects/lightening_effect.cc (modified) branches/atmospheric_engine Thu, 22 Jun 2006 11:09:55 GMT bensch [8712] * branches/script_engine (deleted) delete branche Thu, 22 Jun 2006 11:09:20 GMT bensch [8711] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/script_engine/Makefile.am (modified) * trunk/src/lib/script_engine/lunartest.lua (deleted) * trunk/src/lib/script_engine/lunartest2.lua (modified) * trunk/src/lib/script_engine/script.cc (modified) * trunk/src/lib/script_engine/script.h (modified) * trunk/src/lib/script_engine/script_class.cc (modified) * trunk/src/lib/script_engine/script_manager.cc (modified) * trunk/src/lib/script_engine/script_manager.h (modified) * trunk/src/lib/script_engine/script_method.cc (modified) * trunk/src/lib/script_engine/script_method.h (modified) * trunk/src/lib/util/executor/executor_lua.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/script_trigger.h (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) merged the script_engine back here Thu, 22 Jun 2006 10:53:48 GMT bensch [8710] * branches/network (copied) new copy Thu, 22 Jun 2006 10:53:29 GMT bensch [8709] * branches/network (deleted) delete merged branche Thu, 22 Jun 2006 10:48:01 GMT bensch [8708] * trunk/src/lib/network/message_manager.cc (modified) * trunk/src/lib/network/message_manager.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/player_stats.cc (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/spectator.cc (modified) merged network back merged with command: svn merge -r8625:HEAD ... Thu, 22 Jun 2006 10:46:29 GMT bensch [8707] * trunk/acinclude.m4 (modified) merged the lua-download-script back Thu, 22 Jun 2006 10:26:44 GMT patrick [8706] * branches/bsp_model/src/world_entities/npcs/generic_npc.cc (modified) flush Thu, 22 Jun 2006 10:17:28 GMT patrick [8705] * branches/bsp_model/src/world_entities/creatures/fps_player.cc (modified) * branches/bsp_model/src/world_entities/npcs/generic_npc.cc (modified) * branches/bsp_model/src/world_entities/npcs/generic_npc.h (modified) bsp: work flush, some more npc functions, and a positioning aid Thu, 22 Jun 2006 10:12:29 GMT amaechler [8704] * branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc (modified) Thu, 22 Jun 2006 09:15:42 GMT amaechler [8703] * branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc (modified) Thu, 22 Jun 2006 09:12:05 GMT amaechler [8702] * branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/lightening_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/lightening_effect.h (modified) * branches/atmospheric_engine/src/lib/graphics/effects/rain_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/snow_effect.cc (modified) * branches/atmospheric_engine/src/world_entities/effects/lightning_bolt.cc (modified) branches/atmospheric_engine: cleanup Thu, 22 Jun 2006 09:06:48 GMT bensch [8701] * branches/gui/src/lib/gui/gl/glgui_handler.cc (modified) * branches/gui/src/lib/gui/gl/glgui_handler.h (modified) * branches/gui/src/story_entities/Makefile.am (modified) * branches/gui/src/story_entities/menu/game_menu.cc (moved) * branches/gui/src/story_entities/menu/game_menu.h (moved) gui:better design Thu, 22 Jun 2006 07:24:24 GMT amaechler [8700] * branches/atmospheric_engine/src/lib/graphics/effects/cloud_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.h (modified) * branches/atmospheric_engine/src/lib/graphics/effects/lightening_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/lightening_effect.h (modified) * branches/atmospheric_engine/src/lib/graphics/effects/rain_effect.cc (modified) branches/atmospheric_engine: ... Thu, 22 Jun 2006 00:32:46 GMT patrick [8699] * branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc (modified) * branches/bsp_model/src/world_entities/creatures/fps_player.cc (modified) bsp: the collision reaction now is adjusted to the object size Wed, 21 Jun 2006 21:51:07 GMT bensch [8698] * branches/gui/src/story_entities/menu/glgui_imagebutton.cc (modified) image-button does what it should Wed, 21 Jun 2006 21:45:20 GMT patrick [8697] * branches/terrain (copied) * branches/terrain/src/defs/debug.h (modified) * branches/terrain/src/defs/glincl.h (modified) * branches/terrain/src/lib/collision_detection/cd_engine.h (modified) * branches/terrain/src/lib/graphics/graphics_engine.cc (modified) * branches/terrain/src/lib/graphics/importer/Makefile.am (modified) * branches/terrain/src/lib/graphics/importer/material.h (modified) * branches/terrain/src/lib/graphics/importer/terrain (copied) * branches/terrain/src/lib/graphics/importer/terrain/buffer_broker.cc (copied) * branches/terrain/src/lib/graphics/importer/terrain/buffer_broker.h (copied) * branches/terrain/src/lib/graphics/importer/terrain/frustum.cc (copied) * branches/terrain/src/lib/graphics/importer/terrain/frustum.h (copied) * branches/terrain/src/lib/graphics/importer/terrain/terrain.cc (copied) * branches/terrain/src/lib/graphics/importer/terrain/terrain.h (copied) * branches/terrain/src/lib/graphics/importer/terrain/terrain_page.cc (copied) * branches/terrain/src/lib/graphics/importer/terrain/terrain_page.h (copied) * branches/terrain/src/lib/graphics/importer/terrain/terrain_quad.cc (copied) * branches/terrain/src/lib/graphics/importer/terrain/terrain_quad.h (copied) * branches/terrain/src/lib/graphics/importer/terrain/types.h (copied) * branches/terrain/src/lib/util/threading.h (modified) * branches/terrain/src/orxonox.cc (modified) * branches/terrain/src/story_entities/game_world.cc (modified) * branches/terrain/src/story_entities/game_world_data.cc (modified) * branches/terrain/src/story_entities/game_world_data.h (modified) * branches/terrain/src/story_entities/multi_player_world_data.cc (modified) * branches/terrain/src/story_entities/simple_game_menu.cc (modified) * branches/terrain/src/util/multiplayer_team_deathmatch.cc (modified) * branches/terrain/src/world_entities/WorldEntities.am (modified) * branches/terrain/src/world_entities/camera.cc (modified) * branches/terrain/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/terrain.cc (deleted) * trunk/src/world_entities/terrain.h (deleted) * branches/terrain/src/world_entities/terrain_entity.cc (copied) * branches/terrain/src/world_entities/terrain_entity.h (copied) merged the terrain with the new trunk (MARK TERRAIN) Wed, 21 Jun 2006 21:44:52 GMT bensch [8696] * branches/gui/src/story_entities/game_menu.cc (modified) better image Wed, 21 Jun 2006 21:36:10 GMT patrick [8695] * branches/terrain (deleted) fuck... mixed trunk copy with local changes. redo Wed, 21 Jun 2006 21:34:25 GMT bensch [8694] * branches/gui/src/story_entities/game_menu.cc (modified) * branches/gui/src/story_entities/menu/glgui_imagebutton.cc (modified) * branches/gui/src/story_entities/menu/glgui_imagebutton.h (modified) nicer look, but still pretty fucked up :) Wed, 21 Jun 2006 21:33:10 GMT patrick [8693] * branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc (modified) * branches/bsp_model/src/world_entities/creatures/fps_player.cc (modified) * branches/terrain (copied) branches: added new branche terrain copy of trunk Wed, 21 Jun 2006 21:30:00 GMT patrick [8692] * branches/terrain.old (moved) moving old branche terrain Wed, 21 Jun 2006 21:29:35 GMT bensch [8691] * branches/gui/src/lib/gui/gl/Makefile.am (modified) * branches/gui/src/story_entities/Makefile.am (modified) * branches/gui/src/story_entities/game_menu.cc (modified) * branches/gui/src/story_entities/menu (added) * branches/gui/src/story_entities/menu/glgui_imagebutton.cc (moved) * branches/gui/src/story_entities/menu/glgui_imagebutton.h (moved) orxonox/trunk: now one can enter levels with the GUI, and Images ... Wed, 21 Jun 2006 21:29:30 GMT ponder [8690] * branches/terrain/src/lib/collision_detection/cd_engine.cc (modified) * branches/terrain/src/story_entities/game_world_data.cc (modified) * branches/terrain/src/world_entities/terrain_entity.cc (modified) Wed, 21 Jun 2006 20:50:07 GMT bensch [8689] * branches/gui/src/lib/gui/gl/specials/glgui_imagebutton.cc (modified) * branches/gui/src/lib/gui/gl/specials/glgui_imagebutton.h (modified) * branches/gui/src/story_entities/game_menu.cc (modified) orxonox/gui: image-widget work Wed, 21 Jun 2006 20:33:24 GMT bensch [8688] * branches/gui/src/lib/gui/gl/Makefile.am (modified) * branches/gui/src/lib/gui/gl/specials/glgui_imagebutton.cc (copied) * branches/gui/src/lib/gui/gl/specials/glgui_imagebutton.h (copied) * branches/gui/src/story_entities/game_menu.cc (modified) * branches/gui/src/story_entities/game_menu.h (modified) added image-button a speciality of glgui to display buttons, that on ... Wed, 21 Jun 2006 20:13:44 GMT patrick [8687] * branches/bsp_model/src/world_entities/creatures/fps_player.cc (modified) bsp: fps player worky Wed, 21 Jun 2006 18:57:39 GMT patrick [8686] * branches/bsp_model/src/world_entities/creatures/fps_player.cc (modified) * branches/bsp_model/src/world_entities/creatures/fps_player.h (modified) * branches/bsp_model/src/world_entities/playable.cc (modified) bsp: fps player extension Wed, 21 Jun 2006 18:52:20 GMT patrick [8685] * branches/bsp_model/src/defs/class_id.h (modified) * branches/bsp_model/src/lib/event/key_mapper.cc (modified) * branches/bsp_model/src/lib/event/key_mapper.h (modified) * branches/bsp_model/src/lib/graphics/importer/interactive_model.h (modified) * branches/bsp_model/src/lib/graphics/importer/md2/md2Model.h (modified) * branches/bsp_model/src/lib/graphics/importer/md3/md3_model.h (modified) * branches/bsp_model/src/world_entities/WorldEntities.am (modified) * branches/bsp_model/src/world_entities/creatures/fps_player.cc (added) * branches/bsp_model/src/world_entities/creatures/fps_player.h (added) * branches/bsp_model/src/world_entities/creatures/md2_creature.cc (modified) bsp: fps player added, woking on it Wed, 21 Jun 2006 16:23:57 GMT ponder [8684] * branches/terrain/src/lib/collision_detection/cd_engine.cc (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain.cc (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain.h (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain_page.cc (modified) * branches/terrain/src/lib/graphics/importer/terrain/terrain_page.h (modified) * branches/terrain/src/world_entities/terrain_entity.cc (modified) Tried to do the collision detection for the terrain. Wed, 21 Jun 2006 16:20:14 GMT rennerc [8683] * branches/network/src/util/multiplayer_team_deathmatch.cc (modified) player can type chatmessages with more than one word without typing " Wed, 21 Jun 2006 15:57:59 GMT snellen [8682] * branches/script_engine/src/lib/script_engine/script.cc (modified) * branches/script_engine/src/world_entities/script_trigger.h (modified) made last changes Wed, 21 Jun 2006 15:50:58 GMT snellen [8681] * branches/script_engine/src/lib/script_engine/script.cc (modified) * branches/script_engine/src/lib/script_engine/script.h (modified) * branches/script_engine/src/lib/script_engine/script_class.cc (modified) * branches/script_engine/src/lib/script_engine/script_manager.cc (modified) * branches/script_engine/src/lib/script_engine/script_manager.h (modified) * branches/script_engine/src/lib/script_engine/script_method.cc (modified) * branches/script_engine/src/lib/script_engine/script_method.h (modified) * branches/script_engine/src/world_entities/script_trigger.cc (modified) * branches/script_engine/src/world_entities/script_trigger.h (modified) added correct header to all files Wed, 21 Jun 2006 15:39:31 GMT snellen [8680] * branches/script_engine/src/defs/class_id.h (modified) * branches/script_engine/src/lib/script_engine/Makefile.am (modified) * branches/script_engine/src/lib/script_engine/script.cc (modified) * branches/script_engine/src/story_entities/game_world.cc (modified) * branches/script_engine/src/world_entities/script_trigger.cc (modified) removed all testing traces Wed, 21 Jun 2006 15:15:26 GMT snellen [8679] * branches/script_engine/src/lib/script_engine/lunartest.lua (deleted) * branches/script_engine/src/lib/script_engine/movechopper.lua (deleted) * branches/script_engine/src/lib/script_engine/script.cc (modified) * branches/script_engine/src/movechopper.lua (deleted) all scripts now get loaded from datadir/scripts Wed, 21 Jun 2006 15:01:17 GMT snellen [8678] * branches/script_engine/src/lib/script_engine/script.cc (modified) * branches/script_engine/src/world_entities/script_trigger.cc (modified) fixed segfault when a script isn't loaded correctly Wed, 21 Jun 2006 14:49:06 GMT bensch [8677] * branches/gui/src/defs/error.h (modified) * branches/gui/src/lib/data/data_tank.h (modified) * branches/gui/src/lib/util/loading/game_loader.cc (modified) * branches/gui/src/story_entities/campaign.cc (modified) * branches/gui/src/story_entities/game_menu.cc (modified) * branches/gui/src/story_entities/game_menu.h (modified) * branches/gui/src/story_entities/game_world.cc (modified) * branches/gui/src/story_entities/game_world_data.cc (modified) * branches/gui/src/story_entities/multi_player_world.cc (modified) * branches/gui/src/story_entities/multi_player_world_data.cc (modified) * branches/gui/src/story_entities/single_player_world_data.cc (modified) * branches/gui/src/story_entities/story_entity.h (modified) new gui implementing work Wed, 21 Jun 2006 14:25:55 GMT snellen [8676] * branches/script_engine/src/lib/script_engine/script.cc (modified) copied movechopper.lua into src Wed, 21 Jun 2006 14:24:52 GMT snellen [8675] * branches/script_engine/src/lib/script_engine/movechopper.lua (modified) * branches/script_engine/src/lib/script_engine/script.cc (modified) copied movechopper.lua into src Wed, 21 Jun 2006 13:57:37 GMT bensch [8674] * branches/gui/src/lib/gui/gl/glgui_button.cc (modified) * branches/gui/src/lib/gui/gl/glgui_button.h (modified) * branches/gui/src/story_entities/game_menu.cc (modified) * branches/gui/src/story_entities/game_menu.h (modified) Game-Menu begin Wed, 21 Jun 2006 13:43:44 GMT bensch [8673] * branches/gui/src/defs/class_id.h (modified) * branches/gui/src/lib/gui/gl/glgui_handler.cc (modified) * branches/gui/src/lib/gui/gl/glgui_widget.h (modified) * branches/gui/src/story_entities/Makefile.am (modified) * branches/gui/src/story_entities/game_menu.cc (copied) * branches/gui/src/story_entities/game_menu.h (copied) added game_menu.cc Wed, 21 Jun 2006 12:59:55 GMT bensch [8672] * branches/gui/src/lib/gui/gl/glgui_button.cc (modified) * branches/gui/src/lib/gui/gl/glgui_handler.cc (modified) * branches/gui/src/lib/gui/gl/glgui_inputline.cc (modified) * branches/gui/src/lib/gui/gl/glgui_slider.cc (modified) * branches/gui/src/lib/gui/gl/glgui_widget.cc (modified) selectables Wed, 21 Jun 2006 12:39:52 GMT bensch [8671] * branches/gui/src/lib/gui/gl/glgui_handler.cc (modified) * branches/gui/src/lib/gui/gl/glgui_handler.h (modified) selecting with keyboard Wed, 21 Jun 2006 12:15:21 GMT bensch [8670] * branches/gui/src/lib/gui/gl/glgui_box.cc (modified) * branches/gui/src/lib/gui/gl/glgui_pushbutton.cc (modified) * branches/gui/src/lib/gui/gl/glgui_widget.cc (modified) less debug Wed, 21 Jun 2006 12:11:21 GMT bensch [8669] * branches/gui/src/lib/gui/gl/glgui_checkbutton.cc (modified) * branches/gui/src/lib/gui/gl/glgui_handler.cc (modified) * branches/gui/src/lib/gui/gl/glgui_pushbutton.cc (modified) * branches/gui/src/lib/gui/gl/glgui_slider.cc (modified) * branches/gui/src/lib/gui/gl/glgui_widget.cc (modified) orxonox/gui: slider behaves as expected Wed, 21 Jun 2006 11:56:41 GMT hdavid [8668] * branches/atmospheric_engine/src/lib/graphics/effects/cloud_effect.cc (modified) * branches/atmospheric_engine/src/lib/graphics/effects/cloud_effect.h (modified) branches/atmospheric_engine: implemented a sky plane with the cloud ... Wed, 21 Jun 2006 11:50:54 GMT bensch [8667] * branches/gui/src/lib/gui/gl/glgui_button.cc (modified) * branches/gui/src/lib/gui/gl/glgui_button.h (modified) * branches/gui/src/lib/gui/gl/glgui_checkbutton.cc (modified) * branches/gui/src/lib/gui/gl/glgui_checkbutton.h (modified) * branches/gui/src/lib/gui/gl/glgui_handler.cc (modified) * branches/gui/src/lib/gui/gl/glgui_handler.h (modified) * branches/gui/src/lib/gui/gl/glgui_pushbutton.cc (modified) * branches/gui/src/lib/gui/gl/glgui_pushbutton.h (modified) * branches/gui/src/lib/gui/gl/glgui_slider.cc (modified) * branches/gui/src/lib/gui/gl/glgui_slider.h (modified) * branches/gui/src/lib/gui/gl/glgui_widget.cc (modified) * branches/gui/src/lib/gui/gl/glgui_widget.h (modified) widgets are selectable now Wed, 21 Jun 2006 11:38:38 GMT snellen [8666] * branches/script_engine/src/lunartest2.lua (deleted) * branches/script_engine/src/story_entities/game_world.cc (modified) * branches/script_engine/src/world_entities/script_trigger.cc (modified) removed lunartest2.lua, cleaned all testing code