Small alterations to the animation and animationManager
Merge branch 'master' into Jonathan
6:10pm 4/17/12
Particle Manager work
6:20pm 4/17/12
6:23 4/17/12
???
6:25pm 4/17/12
State machine done, Options under construction.
Options done and message system is there but not used.
Events and message systems are done but not tested
Animation engine base functionality completed
added CreatePlayerMessage cpp and h
Particle Engine Finished
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault

Conflicts:
	armored assault/Debug/Animation.obj
	armored assault/Debug/AnimationInfo.obj
	armored assault/Debug/AnimationManager.obj
	armored assault/Debug/Armored Assault.exe
	armored assault/Debug/Armored Assault.ilk
	armored assault/Debug/Armored Assault.lastbuildstate
	armored assault/Debug/Armored Assault.log
	armored assault/Debug/Armored Assault.pdb
	armored assault/Debug/AutoCannon.obj
	armored assault/Debug/BaseObject.obj
	armored assault/Debug/BossEnemy.obj
	armored assault/Debug/Bullet.obj
	armored assault/Debug/CL.read.1.tlog
	armored assault/Debug/CL.write.1.tlog
	armored assault/Debug/CSGD_Direct3D.obj
	armored assault/Debug/CSGD_DirectInput.obj
	armored assault/Debug/CSGD_TextureManager.obj
	armored assault/Debug/CSGD_XAudio2.obj
	armored assault/Debug/CreditsMenuState.obj
	armored assault/Debug/Destructibles.obj
	armored assault/Debug/Emitter.obj
	armored assault/Debug/Enemy.obj
	armored assault/Debug/Frame.obj
	armored assault/Debug/Game.obj
	armored assault/Debug/GameOverState.obj
	armored assault/Debug/GamePlayState.obj
	armored assault/Debug/Hazard.obj
	armored assault/Debug/HowToMenuState.obj
	armored assault/Debug/IntroMenuState.obj
	armored assault/Debug/InventoryMenuState.obj
	armored assault/Debug/Laser.obj
	armored assault/Debug/LaserBullet.obj
	armored assault/Debug/Layer.obj
	armored assault/Debug/MainMenuState.obj
	armored assault/Debug/MeleeWeapon.obj
	armored assault/Debug/MessageSystem.obj
	armored assault/Debug/Missile.obj
	armored assault/Debug/MissileLauncher.obj
	armored assault/Debug/ObjectManager.obj
	armored assault/Debug/OptionsMenuState.obj
	armored assault/Debug/Particle.obj
	armored assault/Debug/PauseMenuState.obj
	armored assault/Debug/Player.obj
	armored assault/Debug/PostGameMenuState.obj
	armored assault/Debug/PowerUp.obj
	armored assault/Debug/Projectile.obj
	armored assault/Debug/SGD_Math.obj
	armored assault/Debug/Tile.obj
	armored assault/Debug/TileManager.obj
	armored assault/Debug/UpgradeMenuState.obj
	armored assault/Debug/Weapon.obj
	armored assault/Debug/WinMain.obj
	armored assault/Debug/cl.command.1.tlog
	armored assault/Debug/link.command.1.tlog
	armored assault/Debug/link.read.1.tlog
	armored assault/Debug/link.write.1.tlog
	armored assault/Debug/mt.command.1.tlog
	armored assault/Debug/mt.read.1.tlog
	armored assault/Debug/rc.command.1.tlog
	armored assault/Debug/rc.read.1.tlog
	armored assault/Debug/rc.write.1.tlog
	armored assault/Debug/tinystr.obj
	armored assault/Debug/tinyxml.obj
	armored assault/Debug/tinyxmlerror.obj
	armored assault/Debug/tinyxmlparser.obj
	armored assault/Debug/vc100.idb
	armored assault/Debug/vc100.pdb
Merge branch 'master' into Particle_Manager

Conflicts:
	armored assault/Source/IntroMenuState.cpp
update ignore
commit
Added Particle Manager Tool
Animation editor interface added
Merge branch 'Jonathan'

Conflicts:
	SGP_AnimationEditor/bin/Debug/SGP_AnimationEditor.vshost.exe.manifest
	armored assault/Debug/Animation.obj
	armored assault/Debug/AnimationInfo.obj
	armored assault/Debug/AnimationManager.obj
	armored assault/Debug/Armored Assault.exe
	armored assault/Debug/Armored Assault.ilk
	armored assault/Debug/Armored Assault.lastbuildstate
	armored assault/Debug/Armored Assault.log
	armored assault/Debug/Armored Assault.pdb
	armored assault/Debug/AutoCannon.obj
	armored assault/Debug/BaseObject.obj
	armored assault/Debug/BossEnemy.obj
	armored assault/Debug/Bullet.obj
	armored assault/Debug/CL.read.1.tlog
	armored assault/Debug/CL.write.1.tlog
	armored assault/Debug/CSGD_Direct3D.obj
	armored assault/Debug/CSGD_DirectInput.obj
	armored assault/Debug/CSGD_TextureManager.obj
	armored assault/Debug/CSGD_XAudio2.obj
	armored assault/Debug/CreditsMenuState.obj
	armored assault/Debug/Destructibles.obj
	armored assault/Debug/Emitter.obj
	armored assault/Debug/Enemy.obj
	armored assault/Debug/Frame.obj
	armored assault/Debug/Game.obj
	armored assault/Debug/GameOverState.obj
	armored assault/Debug/GamePlayState.obj
	armored assault/Debug/Hazard.obj
	armored assault/Debug/HowToMenuState.obj
	armored assault/Debug/IntroMenuState.obj
	armored assault/Debug/InventoryMenuState.obj
	armored assault/Debug/Laser.obj
	armored assault/Debug/LaserBullet.obj
	armored assault/Debug/Layer.obj
	armored assault/Debug/MainMenuState.obj
	armored assault/Debug/MeleeWeapon.obj
	armored assault/Debug/MessageSystem.obj
	armored assault/Debug/Missile.obj
	armored assault/Debug/MissileLauncher.obj
	armored assault/Debug/ObjectManager.obj
	armored assault/Debug/OptionsMenuState.obj
	armored assault/Debug/Particle.obj
	armored assault/Debug/PauseMenuState.obj
	armored assault/Debug/Player.obj
	armored assault/Debug/PostGameMenuState.obj
	armored assault/Debug/PowerUp.obj
	armored assault/Debug/Projectile.obj
	armored assault/Debug/SGD_Math.obj
	armored assault/Debug/Tile.obj
	armored assault/Debug/TileManager.obj
	armored assault/Debug/UpgradeMenuState.obj
	armored assault/Debug/Weapon.obj
	armored assault/Debug/WinMain.obj
	armored assault/Debug/cl.command.1.tlog
	armored assault/Debug/link.command.1.tlog
	armored assault/Debug/link.read.1.tlog
	armored assault/Debug/link.write.1.tlog
	armored assault/Debug/mt.command.1.tlog
	armored assault/Debug/mt.read.1.tlog
	armored assault/Debug/rc.command.1.tlog
	armored assault/Debug/rc.read.1.tlog
	armored assault/Debug/rc.write.1.tlog
	armored assault/Debug/tinystr.obj
	armored assault/Debug/tinyxml.obj
	armored assault/Debug/tinyxmlerror.obj
	armored assault/Debug/tinyxmlparser.obj
	armored assault/Debug/vc100.idb
	armored assault/Debug/vc100.pdb
	armored assault/Source/ObjectManager.cpp
fixes