testing out why i cant pull
new branch: zachbranch
renamed Main state to Main_Gameplay
added terrainmap
Got a crappy map generation made, added an input object to main gameplay
Added collision detection for a point in terrainmap
added inefficient exsplosion method for circles
added a test for the exsplosion
test changes
added res folder
Merge branch 'AdamBranch'
Added parameters to prevent crashing upon map generation (hopefully)
Added superclass for shots so we can create weapons
Changed the radius of effect to area of effect since circle shots should
extend this. Using Shape right now for the area. May change.
Building heirarchy for circular shots. Still a lot of work to go
Merge remote-tracking branch 'origin/master'
Added a basic normal shot
Added booleans for the 4 stages of life of a shot: Alive and not shot,
alive and shot, alive and animating, and dead. Alive when isAlive is
true, shot when isShot is true, animating when isAnimating is true, dead
when isAlive is false (set this at end of animation)
Added an inital radius and stored radius for animation purposes.
Moved Circle Exsplosion to circlular shot