#
# ChangeLog for branches/terrain/src/story_entities/simple_game_menu.cc in orxonox.OLD
#
# Generated by Trac 1.0.9
# Jun 16, 2024, 2:16:41 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)


Tue, 20 Jun 2006 11:24:11 GMT bensch [8619]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/graphics/Makefile.am (modified)
	* trunk/src/lib/graphics/effects/lense_flare.cc (modified)
	* trunk/src/lib/graphics/effects/lense_flare.h (modified)
	* trunk/src/lib/graphics/importer/material.cc (modified)
	* trunk/src/lib/graphics/importer/material.h (modified)
	* trunk/src/lib/graphics/importer/texture_sequence.cc (modified)
	* trunk/src/lib/graphics/text_engine/limited_width_text.cc (copied)
	* trunk/src/lib/graphics/text_engine/limited_width_text.h (copied)
	* 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/Makefile.am (modified)
	* trunk/src/lib/gui/gl/glgui.h (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_container.cc (modified)
	* trunk/src/lib/gui/gl/glgui_cursor.cc (modified)
	* trunk/src/lib/gui/gl/glgui_defs.h (modified)
	* trunk/src/lib/gui/gl/glgui_image.cc (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_slider.cc (modified)
	* trunk/src/lib/gui/gl/glgui_style.cc (deleted)
	* trunk/src/lib/gui/gl/glgui_style.h (deleted)
	* trunk/src/lib/gui/gl/glgui_table.cc (copied)
	* trunk/src/lib/gui/gl/glgui_table.h (copied)
	* trunk/src/lib/gui/gl/glgui_widget.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.h (modified)
	* trunk/src/lib/gui/gl/specials/glgui_notifier.cc (modified)
	* trunk/src/lib/gui/gl/specials/glgui_notifier.h (modified)
	* trunk/src/lib/math/rect2D.cc (modified)
	* trunk/src/lib/math/rect2D.h (modified)
	* trunk/src/lib/sound/sound_buffer.cc (modified)
	* trunk/src/lib/util/color.cc (modified)
	* trunk/src/lib/util/executor/functor_list.h (modified)
	* trunk/src/lib/util/filesys/file.cc (modified)
	* trunk/src/lib/util/filesys/file.h (modified)
	* trunk/src/story_entities/simple_game_menu.cc (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.cc (modified)
	* trunk/src/world_entities/skybox.h (modified)

	trunk: merged the gui-branche back.
	merged with command:
	svn merge ...