Fuck you josh
Merge remote-tracking branch 'origin/master' into tyler
Added in the shoot functionality to the characters and added in the boss characters special functionality.
Merge remote-tracking branch 'origin/Wes'
Got most of the npc - player interactions done. The only main thing I can think of to do next is to make the npcs run at the player.
Most of the mouse stuf fis working now. Also, the game pauses on esc
Merge branch 'master' of https://github.com/tylerfelker/SoftwareEngineeringProject
Merge remote-tracking branch 'origin/master' into tyler
Most of the mouse stuf fis working now. Also, the game pauses on esc
Fuck you josh
Most of the mouse stuf fis working now. Also, the game pauses on esc
Made some changes. primarily to do with special effects and the npc's running at the player.
More listener and window stuff
Merge remote-tracking branch 'origin/tyler'

Conflicts:
	ACFramework Version 2.01/ACFramework/ACDoc.cs
	ACFramework Version 2.01/ACFramework/ACFramework.cs
	ACFramework Version 2.01/ACFramework/cModernListener.cs
Merge conflict bs

fuck github
Merge remote-tracking branch 'origin/tyler'
Merge remote-tracking branch 'origin/master' into Wes

Conflicts:
	ACFramework Version 2.01/ACFramework/ACFramework.cs
	ACFramework Version 2.01/ACFramework/cCritter3DcharacterSurvial.cs
	ACFramework Version 2.01/ACFramework/cJasonv.cs
	ACFramework Version 2.01/ACFramework/cModernListener.cs
Merge remote-tracking branch 'origin/master' into Joshie