#
# ChangeLog for branches/terrain/Makefile.am in orxonox.OLD
#
# Generated by Trac 1.0.9
# Dec 11, 2024, 1:56:47 PM

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, 15 Jun 2006 10:48:26 GMT bensch [8448]
	* trunk/Makefile.am (modified)
	* trunk/configure.ac (modified)
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/graphics/importer/material.h (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/gui/gl/glgui_bar.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_defs.h (modified)
	* trunk/src/lib/gui/gl/glgui_handler.cc (modified)
	* trunk/src/lib/gui/gl/glgui_image.cc (modified)
	* trunk/src/lib/gui/gl/glgui_image.h (modified)
	* trunk/src/lib/gui/gl/glgui_inputline.cc (modified)
	* trunk/src/lib/gui/gl/glgui_inputline.h (modified)
	* trunk/src/lib/gui/gl/glgui_pushbutton.cc (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_style.cc (modified)
	* trunk/src/lib/gui/gl/glgui_style.h (modified)
	* trunk/src/lib/gui/gl/glgui_textfield.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.h (modified)
	* trunk/src/lib/math/rect2D.cc (modified)
	* trunk/src/lib/math/rect2D.h (modified)
	* trunk/src/lib/util/color.cc (modified)
	* trunk/src/lib/util/color.h (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)

	merged gui back to the trunk
	merged with command
	merge -r8377:HEAD ...