#
# ChangeLog for branches/terrain/AUTHORS in orxonox.OLD
#
# Generated by Trac 1.0.9
# Nov 26, 2024, 12:49:42 AM

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)


Thu, 30 Mar 2006 09:45:31 GMT bensch [7256]
	* trunk/AUTHORS (modified)
	* trunk/configure.ac (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/defs/globals.h (modified)
	* trunk/src/lib/BuildLibs.am (modified)
	* trunk/src/lib/Makefile.am (modified)
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/event/event_handler.h (modified)
	* trunk/src/lib/event/key_mapper.cc (modified)
	* trunk/src/lib/event/key_mapper.h (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/graphics_engine.h (modified)
	* trunk/src/lib/network/network_manager.cc (modified)
	* trunk/src/lib/network/network_manager.h (modified)
	* trunk/src/lib/parser/Makefile.am (modified)
	* trunk/src/lib/parser/cmdline_parser (copied)
	* trunk/src/lib/parser/cmdline_parser/Makefile.am (copied)
	* trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc (copied)
	* trunk/src/lib/parser/cmdline_parser/cmdline_parser.h (copied)
	* trunk/src/lib/parser/ini_parser/ini_parser.cc (modified)
	* trunk/src/lib/parser/ini_parser/ini_parser.h (modified)
	* trunk/src/lib/parser/preferences (copied)
	* trunk/src/lib/parser/preferences/Makefile.am (copied)
	* trunk/src/lib/parser/preferences/cmd_line_prefs_reader.cc (copied)
	* trunk/src/lib/parser/preferences/cmd_line_prefs_reader.h (copied)
	* trunk/src/lib/parser/preferences/ini_file_prefs_reader.cc (copied)
	* trunk/src/lib/parser/preferences/ini_file_prefs_reader.h (copied)
	* trunk/src/lib/sound/sound_engine.cc (modified)
	* trunk/src/lib/sound/sound_engine.h (modified)
	* trunk/src/lib/util/preferences.cc (copied)
	* trunk/src/lib/util/preferences.h (copied)
	* trunk/src/orxonox.cc (modified)
	* trunk/src/orxonox.h (modified)
	* trunk/src/subprojects/framework.cc (modified)

	orxonox/trunk: merged the preferences back to the trunk
	merged with ...