#
# ChangeLog for branches/powerups/src in orxonox.OLD
#
# Generated by Trac 1.0.9
# Nov 27, 2024, 8:39:57 PM

Wed, 21 Dec 2005 14:20:57 GMT manuel [6235]
	* branches/powerups/src/world_entities/power_ups/power_up.cc (modified)

	some small fixes before trunk merge


Wed, 21 Dec 2005 14:09:37 GMT manuel [6233]
	* branches/powerups/src/defs/class_id.h (modified)
	* branches/powerups/src/world_entities/power_ups/param_power_up.cc (modified)
	* branches/powerups/src/world_entities/power_ups/power_up.cc (modified)
	* branches/powerups/src/world_entities/power_ups/weapon_power_up.cc (modified)
	* branches/powerups/src/world_entities/space_ships/space_ship.cc (modified)
	* branches/powerups/src/world_entities/space_ships/space_ship.h (modified)

	powerup: merged old powerups into new trunk framework


Wed, 21 Dec 2005 12:57:14 GMT bensch [6223]
	* branches/powerups (copied)

	branches: copied trunk to powerups


Wed, 21 Dec 2005 12:49:06 GMT bensch [6222]
	* trunk (modified)
	* trunk/src (modified)
	* trunk/src/Makefile.am (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib (modified)
	* trunk/src/lib/collision_detection (modified)
	* trunk/src/lib/collision_detection/cd_engine.cc (modified)
	* trunk/src/lib/collision_detection/obb.cc (modified)
	* trunk/src/lib/event (modified)
	* trunk/src/lib/graphics (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/importer (modified)
	* trunk/src/lib/graphics/importer/md2Model.cc (modified)
	* trunk/src/lib/graphics/importer/md2Model.h (modified)
	* trunk/src/lib/graphics/importer/model.h (modified)
	* trunk/src/lib/graphics/render2D/render_2d.cc (modified)
	* trunk/src/lib/graphics/spatial_separation (modified)
	* trunk/src/lib/graphics/text_engine/text_engine.cc (modified)
	* trunk/src/lib/gui (modified)
	* trunk/src/lib/gui/gl_gui (modified)
	* trunk/src/lib/gui/gtk_gui (modified)
	* trunk/src/lib/network (modified)
	* trunk/src/lib/parser (modified)
	* trunk/src/lib/parser/ini_parser (modified)
	* trunk/src/lib/parser/tinyxml (modified)
	* trunk/src/lib/particles (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/lib/physics (modified)
	* trunk/src/lib/shell (modified)
	* trunk/src/lib/shell/shell.cc (modified)
	* trunk/src/lib/shell/shell_buffer.cc (modified)
	* trunk/src/lib/shell/shell_command.cc (modified)
	* trunk/src/lib/shell/shell_input.cc (modified)
	* trunk/src/lib/sound (modified)
	* trunk/src/lib/sound/sound_engine.cc (modified)
	* trunk/src/lib/util/executor/executor.cc (modified)
	* trunk/src/story_entities/debug_world.cc (modified)
	* trunk/src/story_entities/network_world.cc (modified)
	* trunk/src/story_entities/world.cc (modified)
	* trunk/src/subprojects (modified)
	* trunk/src/subprojects/collision_detection (modified)
	* trunk/src/subprojects/importer (modified)
	* trunk/src/subprojects/importer/Makefile.am (modified)
	* trunk/src/subprojects/importer/importer.cc (modified)
	* trunk/src/subprojects/network (modified)
	* trunk/src/subprojects/particles (modified)
	* trunk/src/subprojects/testmain (modified)
	* trunk/src/util (modified)
	* trunk/src/util/animation/animation.h (modified)
	* trunk/src/util/loading/resource_manager.cc (modified)
	* trunk/src/util/loading/resource_manager.h (modified)
	* trunk/src/util/state.cc (modified)
	* trunk/src/util/state.h (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/camera.cc (modified)
	* trunk/src/world_entities/creatures (copied)
	* trunk/src/world_entities/creatures/md2_creature.cc (copied)
	* trunk/src/world_entities/creatures/md2_creature.h (copied)
	* trunk/src/world_entities/npcs/npc.cc (modified)
	* trunk/src/world_entities/npcs/npc_test.cc (modified)
	* trunk/src/world_entities/npcs/npc_test1.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/player.cc (modified)
	* trunk/src/world_entities/power_ups/laser_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/param_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/turret_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.cc (modified)
	* trunk/src/world_entities/satellite.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.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/test_entity.cc (modified)
	* trunk/src/world_entities/test_entity.h (modified)
	* trunk/src/world_entities/weapons/aim.cc (modified)
	* trunk/src/world_entities/weapons/bomb.cc (modified)
	* trunk/src/world_entities/weapons/guided_missile.cc (modified)
	* trunk/src/world_entities/weapons/laser.cc (modified)
	* trunk/src/world_entities/weapons/rocket.cc (modified)
	* trunk/src/world_entities/weapons/test_bullet.cc (modified)
	* trunk/src/world_entities/weapons/test_gun.cc (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: merged the christmas branche to the trunk
	merged with ...