git.octo.it Git - supertux.git/commit

author	Matthias Braun <matze@braunis.de>
	Sun, 9 Jul 2006 10:32:59 +0000 (10:32 +0000)
committer	Matthias Braun <matze@braunis.de>
	Sun, 9 Jul 2006 10:32:59 +0000 (10:32 +0000)
commit	2892ebda09d24c977547159e34abf0244884b89e
tree	b6c89519c3d5558908e2b98fa29b22847160916b	tree \| snapshot
parent	a5eb1a582bf8c975d12293d7e5199a365a7e191b	commit \| diff

merged new collision detection branch back into mainline

SVN-Revision: 3962

101 files changed:

data/images/objects/bullets/firebullet.sprite		diff \| blob \| history
data/levels/test/simple.stl		diff \| blob \| history
data/levels/test/slopes.stl		diff \| blob \| history
src/badguy/angrystone.cpp		diff \| blob \| history
src/badguy/angrystone.hpp		diff \| blob \| history
src/badguy/badguy.cpp		diff \| blob \| history
src/badguy/badguy.hpp		diff \| blob \| history
src/badguy/bomb.cpp		diff \| blob \| history
src/badguy/bomb.hpp		diff \| blob \| history
src/badguy/bouncing_snowball.cpp		diff \| blob \| history
src/badguy/bouncing_snowball.hpp		diff \| blob \| history
src/badguy/dart.cpp		diff \| blob \| history
src/badguy/dart.hpp		diff \| blob \| history
src/badguy/fish.cpp		diff \| blob \| history
src/badguy/fish.hpp		diff \| blob \| history
src/badguy/flyingsnowball.cpp		diff \| blob \| history
src/badguy/flyingsnowball.hpp		diff \| blob \| history
src/badguy/igel.cpp		diff \| blob \| history
src/badguy/igel.hpp		diff \| blob \| history
src/badguy/jumpy.cpp		diff \| blob \| history
src/badguy/jumpy.hpp		diff \| blob \| history
src/badguy/kugelblitz.cpp		diff \| blob \| history
src/badguy/kugelblitz.hpp		diff \| blob \| history
src/badguy/mrbomb.cpp		diff \| blob \| history
src/badguy/mrbomb.hpp		diff \| blob \| history
src/badguy/mriceblock.cpp		diff \| blob \| history
src/badguy/mriceblock.hpp		diff \| blob \| history
src/badguy/mrrocket.cpp		diff \| blob \| history
src/badguy/mrrocket.hpp		diff \| blob \| history
src/badguy/mrtree.cpp		diff \| blob \| history
src/badguy/mrtree.hpp		diff \| blob \| history
src/badguy/nolok_01.cpp	[deleted file]	blob \| history
src/badguy/nolok_01.hpp	[deleted file]	blob \| history
src/badguy/plant.cpp		diff \| blob \| history
src/badguy/plant.hpp		diff \| blob \| history
src/badguy/poisonivy.cpp		diff \| blob \| history
src/badguy/poisonivy.hpp		diff \| blob \| history
src/badguy/rocketexplosion.cpp		diff \| blob \| history
src/badguy/rocketexplosion.hpp		diff \| blob \| history
src/badguy/skullyhop.cpp		diff \| blob \| history
src/badguy/skullyhop.hpp		diff \| blob \| history
src/badguy/snail.cpp		diff \| blob \| history
src/badguy/snail.hpp		diff \| blob \| history
src/badguy/snowball.cpp		diff \| blob \| history
src/badguy/snowball.hpp		diff \| blob \| history
src/badguy/spidermite.cpp		diff \| blob \| history
src/badguy/spidermite.hpp		diff \| blob \| history
src/badguy/spiky.cpp		diff \| blob \| history
src/badguy/spiky.hpp		diff \| blob \| history
src/badguy/sspiky.cpp		diff \| blob \| history
src/badguy/sspiky.hpp		diff \| blob \| history
src/badguy/stalactite.cpp		diff \| blob \| history
src/badguy/stalactite.hpp		diff \| blob \| history
src/badguy/totem.cpp		diff \| blob \| history
src/badguy/totem.hpp		diff \| blob \| history
src/badguy/yeti.cpp		diff \| blob \| history
src/badguy/yeti.hpp		diff \| blob \| history
src/badguy/zeekling.cpp		diff \| blob \| history
src/badguy/zeekling.hpp		diff \| blob \| history
src/collision.cpp		diff \| blob \| history
src/collision.hpp		diff \| blob \| history
src/collision_grid.cpp	[deleted file]	blob \| history
src/collision_grid.hpp	[deleted file]	blob \| history
src/collision_grid_iterator.hpp	[deleted file]	blob \| history
src/collision_hit.hpp		diff \| blob \| history
src/log.cpp		diff \| blob \| history
src/log.hpp		diff \| blob \| history
src/math/rect.hpp		diff \| blob \| history
src/moving_object.hpp		diff \| blob \| history
src/object/block.cpp		diff \| blob \| history
src/object/bullet.cpp		diff \| blob \| history
src/object/bullet.hpp		diff \| blob \| history
src/object/candle.cpp		diff \| blob \| history
src/object/coin.cpp		diff \| blob \| history
src/object/coin.hpp		diff \| blob \| history
src/object/flower.cpp		diff \| blob \| history
src/object/flower.hpp		diff \| blob \| history
src/object/growup.cpp		diff \| blob \| history
src/object/growup.hpp		diff \| blob \| history
src/object/hurting_platform.cpp		diff \| blob \| history
src/object/invisible_block.cpp		diff \| blob \| history
src/object/invisible_block.hpp		diff \| blob \| history
src/object/particlesystem_interactive.cpp		diff \| blob \| history
src/object/platform.cpp		diff \| blob \| history
src/object/player.cpp		diff \| blob \| history
src/object/player.hpp		diff \| blob \| history
src/object/powerup.cpp		diff \| blob \| history
src/object/powerup.hpp		diff \| blob \| history
src/object/rock.cpp		diff \| blob \| history
src/object/rock.hpp		diff \| blob \| history
src/object/scripted_object.cpp		diff \| blob \| history
src/object/scripted_object.hpp		diff \| blob \| history
src/object/skull_tile.cpp		diff \| blob \| history
src/object/star.cpp		diff \| blob \| history
src/object/star.hpp		diff \| blob \| history
src/object/unstable_tile.cpp		diff \| blob \| history
src/object/weak_block.hpp		diff \| blob \| history
src/scripting/player.hpp		diff \| blob \| history
src/scripting/wrapper.cpp		diff \| blob \| history
src/sector.cpp		diff \| blob \| history
src/sector.hpp		diff \| blob \| history

SVN import of the official repository.

RSS Atom