#
# ChangeLog for code/branches/weapons
#
# Generated by Trac 1.0.9
# Dec 15, 2024, 6:42:34 AM

Thu, 26 May 2011 11:38:58 GMT dafrick [8591]
	* code/branches/weapons/data/levels/emptyLevel.oxw (modified)
	* code/branches/weapons/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/weapons/data/levels/includes/weaponSettingsAssff2.oxi (added)
	* code/branches/weapons/data/levels/templates/spaceshipAssff2.oxt (added)

	Moving new weapon model to Assff2.


Thu, 26 May 2011 09:02:55 GMT jonas [8590]
	* code/branches/weapons/data/particle/weaponflare.particle (added)
	* code/branches/weapons/data/particle/weaponshoot.particle (added)

	naechster versuch


Mon, 09 May 2011 13:38:24 GMT jonas [8429]
	* code/branches/weapons/data/levels/emptyLevel.oxw (modified)
	* code/branches/weapons/data/levels/includes/weaponSettingsAssff.oxi (modified)

	model attached, flare stimmt, effect noch nicht...


Mon, 04 Apr 2011 14:07:54 GMT jonas [8190]
	* code/branches/weapons/data/levels/emptyLevel.oxw (modified)

	model texturiert und ingame eingefuegt


Mon, 28 Mar 2011 13:26:34 GMT dafrick [8142]
	* code/branches/weapons (copied)

	New branch to work on weapons.


Wed, 23 Mar 2011 20:57:54 GMT dafrick [8108]
	* code/trunk (modified)
	* code/trunk/doc/api/Groups.dox (modified)
	* code/trunk/doc/api/groups (copied)
	* code/trunk/doc/api/groups/Notifications.dox (copied)
	* code/trunk/doc/api/groups/Pickup.dox (copied)
	* code/trunk/doc/api/groups/Questsystem.dox (copied)
	* code/trunk/doc/api/groups/Triggers.dox (copied)
	* code/trunk/src/libraries/core/Loader.cc (modified)
	* code/trunk/src/libraries/network/Host.cc (modified)
	* code/trunk/src/libraries/network/MasterServerComm.h (modified)
	* code/trunk/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/trunk/src/modules/pickup/Pickup.h (modified)
	* code/trunk/src/modules/pong/Pong.cc (modified)
	* code/trunk/src/modules/pong/Pong.h (modified)
	* code/trunk/src/modules/pong/PongAI.cc (modified)
	* code/trunk/src/modules/pong/PongAI.h (modified)
	* code/trunk/src/modules/pong/PongBall.cc (modified)
	* code/trunk/src/modules/pong/PongBall.h (modified)
	* code/trunk/src/modules/pong/PongBat.cc (modified)
	* code/trunk/src/modules/pong/PongBat.h (modified)
	* code/trunk/src/modules/pong/PongBot.cc (modified)
	* code/trunk/src/modules/pong/PongBot.h (modified)
	* code/trunk/src/modules/pong/PongCenterpoint.cc (modified)
	* code/trunk/src/modules/pong/PongCenterpoint.h (modified)
	* code/trunk/src/modules/pong/PongScore.cc (modified)
	* code/trunk/src/modules/pong/PongScore.h (modified)

	Merging changes from tetris branch into trunk, since they are also ...