Room Changes

Changed the room to add a door on a castle like structure(MAY NOT
IMPLEMENT)
Merge remote-tracking branch 'origin/master' into Joshie
Room changes-Added bitmaps, chaged textures, setRoom works with added wall in middle
Room Changes

Changed the room to add a door on a castle like structure(MAY NOT
IMPLEMENT)
Room changes-Added bitmaps, chaged textures, setRoom works with added wall in middle
WE FINALLY HAVE A GAME! =D
Took the code out of the constructor to try and avoid conflicts.
Put code back in the constructor
I got the game working so that the different characters for each level are implemented as well. And I changed it so that if the player collides with a boss then the die as apposed to just dropping the grenade and dying.
Made the drawbridge extend all the way from the floor to the ceiling so that it counts as a room.
Revert "Room changes-Added bitmaps, chaged textures, setRoom works with added wall in middle"

This reverts commit a407f69024690ecf5fee0849049cd4f3f56c1108.
Revert "Room Changes"

This reverts commit 5b7af530332f2238b07bb3cbe462894dc5e84e55.
Merge branch 'master' of https://github.com/tylerfelker/SoftwareEngineeringProject
Merge remote-tracking branch 'origin/Joshie'

Conflicts:
	ACFramework Version 2.01/ACFramework/cGame3DSurvival.cs
	ACFramework Version 2.01/ACFramework/game3D.cs
Added the castle and door to the game3D survival
Both rooms integrated(Mine + Wes' code)
Game works as hoped
Merge remote-tracking branch 'origin/tyler'

Conflicts:
	ACFramework Version 2.01/ACFramework/ACFramework.cs
	ACFramework Version 2.01/ACFramework/cCritter3DcharacterSurvial.cs
	ACFramework Version 2.01/ACFramework/cGame3DSurvival.cs