#
# ChangeLog for branches/water/src/story_entities in orxonox.OLD
#
# Generated by Trac 1.0.9
# Sep 22, 2024, 3:23:54 AM

Thu, 01 Jun 2006 15:24:57 GMT stefalie [8089]
	* branches/water/src/lib/graphics/importer/material.cc (modified)
	* branches/water/src/lib/graphics/importer/texture.cc (modified)
	* branches/water/src/lib/graphics/importer/texture.h (modified)
	* branches/water/src/lib/gui/gl_gui/glgui_cursor.cc (modified)
	* branches/water/src/lib/gui/gl_gui/glgui_handler.cc (modified)
	* branches/water/src/lib/gui/gl_gui/glgui_widget.cc (modified)
	* branches/water/src/lib/gui/gl_gui/glgui_widget.h (modified)
	* branches/water/src/story_entities/game_world.cc (modified)
	* branches/water/src/story_entities/game_world.h (modified)
	* branches/water/src/world_entities/environments/mapped_water.cc (modified)

	water: gui hack


Thu, 01 Jun 2006 12:01:26 GMT bensch [8063]
	* branches/water (copied)

	copy


Wed, 31 May 2006 14:52:34 GMT bensch [8037]
	* trunk/src/lib/graphics/importer/material.cc (modified)
	* trunk/src/lib/graphics/importer/material.h (modified)
	* trunk/src/lib/graphics/shader.cc (modified)
	* trunk/src/lib/graphics/shader.h (modified)
	* trunk/src/lib/graphics/text_engine/text.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/util/object_manager.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.h (modified)
	* trunk/src/world_entities/skybox.cc (modified)
	* trunk/src/world_entities/terrain.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	trunk: merged the water back
	merged with command
	svn merge ...