#
# ChangeLog for branches/adm/ChangeLog in orxonox.OLD
#
# Generated by Trac 1.0.9
# Dec 27, 2024, 3:56:09 AM

Thu, 10 May 2007 14:26:44 GMT snellen [10652]
	* branches/adm (copied)

	new branch for the development of th automatic defence mechanism


Thu, 25 Jan 2007 13:18:07 GMT patrick [10368]
	* trunk (modified)
	* trunk/ChangeLog (modified)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/graphics/importer/vertex_array_model.cc (modified)
	* trunk/src/lib/gui/gl/glgui_bar.cc (modified)
	* trunk/src/lib/gui/gl/glgui_box.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.h (modified)
	* trunk/src/lib/math/curve.cc (modified)
	* trunk/src/lib/math/curve.h (modified)
	* trunk/src/lib/math/spline.cc (copied)
	* trunk/src/lib/math/spline.h (copied)
	* trunk/src/lib/util/loading/fast_factory.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/menu/game_menu.cc (modified)
	* trunk/src/util/Makefile.am (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)
	* trunk/src/util/state.h (modified)
	* trunk/src/util/track/track.cc (copied)
	* trunk/src/util/track/track.h (copied)
	* trunk/src/util/track/track_manager.cc (modified)
	* trunk/src/util/track/track_manager.h (modified)
	* trunk/src/util/track/track_node.cc (modified)
	* trunk/src/util/track/track_node.h (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/WorldEntities.am (modified)
	* trunk/src/world_entities/camera.cc (modified)
	* trunk/src/world_entities/camera.h (modified)
	* trunk/src/world_entities/effects/trail.cc (copied)
	* trunk/src/world_entities/effects/trail.h (copied)
	* trunk/src/world_entities/effects/wobblegrid.cc (copied)
	* trunk/src/world_entities/effects/wobblegrid.h (copied)
	* trunk/src/world_entities/elements/glgui_energywidget.h (modified)
	* trunk/src/world_entities/elements/glgui_energywidgetvertical.cc (copied)
	* trunk/src/world_entities/elements/glgui_energywidgetvertical.h (copied)
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)
	* trunk/src/world_entities/particles/emitter_node.cc (copied)
	* trunk/src/world_entities/particles/emitter_node.h (copied)
	* trunk/src/world_entities/particles/particle_emitter.h (modified)
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/player.cc (modified)
	* trunk/src/world_entities/player.h (modified)
	* trunk/src/world_entities/projectiles/acid_splash.cc (copied)
	* trunk/src/world_entities/projectiles/acid_splash.h (copied)
	* trunk/src/world_entities/projectiles/hbolt.cc (copied)
	* trunk/src/world_entities/projectiles/hbolt.h (copied)
	* trunk/src/world_entities/projectiles/lbolt.cc (copied)
	* trunk/src/world_entities/projectiles/lbolt.h (copied)
	* trunk/src/world_entities/projectiles/mbolt.cc (copied)
	* trunk/src/world_entities/projectiles/mbolt.h (copied)
	* trunk/src/world_entities/projectiles/projectile.cc (modified)
	* trunk/src/world_entities/projectiles/projectile.h (modified)
	* trunk/src/world_entities/projectiles/projectile_weapon.cc (copied)
	* trunk/src/world_entities/projectiles/projectile_weapon.h (copied)
	* trunk/src/world_entities/projectiles/spike.cc (copied)
	* trunk/src/world_entities/projectiles/spike.h (copied)
	* trunk/src/world_entities/projectiles/spike_ball.cc (copied)
	* trunk/src/world_entities/projectiles/spike_ball.h (copied)
	* trunk/src/world_entities/projectiles/swarm_projectile.cc (copied)
	* trunk/src/world_entities/projectiles/swarm_projectile.h (copied)
	* trunk/src/world_entities/sound_entity.cc (modified)
	* trunk/src/world_entities/sound_entity.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.h (modified)
	* trunk/src/world_entities/space_ships/spacecraft_2d.cc (modified)
	* trunk/src/world_entities/space_ships/spacecraft_2d.h (modified)
	* trunk/src/world_entities/test_entity.cc (modified)
	* trunk/src/world_entities/test_entity2.cc (copied)
	* trunk/src/world_entities/test_entity2.h (copied)
	* trunk/src/world_entities/weapons/acid_launcher.cc (copied)
	* trunk/src/world_entities/weapons/acid_launcher.h (copied)
	* trunk/src/world_entities/weapons/heavy_blaster.cc (copied)
	* trunk/src/world_entities/weapons/heavy_blaster.h (copied)
	* trunk/src/world_entities/weapons/light_blaster.cc (copied)
	* trunk/src/world_entities/weapons/light_blaster.h (copied)
	* trunk/src/world_entities/weapons/medium_blaster.cc (copied)
	* trunk/src/world_entities/weapons/medium_blaster.h (copied)
	* trunk/src/world_entities/weapons/spike_launcher.cc (copied)
	* trunk/src/world_entities/weapons/spike_launcher.h (copied)
	* trunk/src/world_entities/weapons/spike_thrower.cc (copied)
	* trunk/src/world_entities/weapons/spike_thrower.h (copied)
	* trunk/src/world_entities/weapons/swarm_launcher.cc (copied)
	* trunk/src/world_entities/weapons/swarm_launcher.h (copied)
	* trunk/src/world_entities/weapons/weapon.cc (modified)
	* trunk/src/world_entities/weapons/weapon.h (modified)
	* trunk/src/world_entities/weapons/weapon_manager.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	merged the branche playability into the trunk