#
# ChangeLog for branches/terrain/src/lib/graphics/effects/graphics_effect.cc in orxonox.OLD
#
# Generated by Trac 1.0.9
# Oct 22, 2024, 7:34:16 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 19:50:56 GMT bensch [8495]
	* trunk/src/lib/collision_reaction/collision_handle.cc (modified)
	* trunk/src/lib/graphics/effects/atmospheric_engine.cc (modified)
	* trunk/src/lib/graphics/effects/cloud_effect.cc (modified)
	* trunk/src/lib/graphics/effects/cloud_effect.h (modified)
	* trunk/src/lib/graphics/effects/fog_effect.cc (modified)
	* trunk/src/lib/graphics/effects/fog_effect.h (modified)
	* trunk/src/lib/graphics/effects/graphics_effect.cc (modified)
	* trunk/src/lib/graphics/effects/graphics_effect.h (modified)
	* trunk/src/lib/graphics/effects/lense_flare.cc (modified)
	* trunk/src/lib/graphics/effects/lense_flare.h (modified)
	* trunk/src/lib/graphics/effects/lightening_effect.cc (modified)
	* trunk/src/lib/graphics/effects/lightening_effect.h (modified)
	* trunk/src/lib/graphics/effects/rain_effect.cc (modified)
	* trunk/src/lib/graphics/effects/rain_effect.h (modified)
	* trunk/src/lib/graphics/effects/sglmodel.h (deleted)
	* trunk/src/lib/graphics/effects/sky.sgl (deleted)
	* trunk/src/lib/graphics/effects/snow_effect.cc (modified)
	* trunk/src/lib/graphics/effects/snow_effect.h (modified)
	* trunk/src/lib/graphics/effects/volfog_effect.cc (modified)
	* trunk/src/lib/graphics/effects/volfog_effect.h (modified)
	* trunk/src/lib/graphics/effects/weather_effect.cc (modified)
	* trunk/src/lib/graphics/effects/weather_effect.h (modified)
	* trunk/src/lib/gui/qt/gui_control.cc (modified)
	* trunk/src/lib/sound/sound_source.cc (modified)
	* trunk/src/lib/sound/sound_source.h (modified)
	* trunk/src/subprojects/benchmark.cc (modified)
	* trunk/src/util/kill_target.cc (modified)
	* trunk/src/world_entities/effects/billboard.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)

	merged the branche atmos back. no conflicts