Merge branch 'master' of github.com:rcatlin/Emergency-Response into beginning_of_scenario
I added depth to professor bell's conversation so he says different things depending on whether or not the active shooter is close. I will add more soon to finish off the Shooter is Close contingency
I just needed to commit these changes so I could update my repo with master. Merging them isn't super important to me. I'll do another commit in 2-3 hrs
Merge branch 'master' of github.com:rcatlin/Emergency-Response into shooter-nearby-changes
These are the final changes I made for Monday's meeting. I added an image for the shooter for when the shooter is close and added additional hiding spots in room 130.
Merge branch 'master' of github.com:rcatlin/Emergency-Response into shooter-nearby-changes
Merge branch 'master' of github.com:rcatlin/Emergency-Response into evacuate-when-shooter-nearby
I made it so that if you choose to run when the shooter is nearby you don't always get shot. Sometime you escape. I still need to add a few more things to complete this contingency, but its close
changed the 'shooter far away' response
Merge branch 'master' of github.com:rcatlin/Emergency-Response into evacuate-when-shooter-nearby
I finished up changes to the evacuate feature. Made the shooter in the south hall visible from room 240. Added functionality so player cannot return to south hall from west end once they escape (or they lose). Made it so they only have 5 sec to escape from hall once they enter it.
Finished up the evacuate and player runs when shooter nearby features. Also Added another image for the shooter in the south hall from 240's perspective
I was trying to push my changed but had to pull and fix a merge conflict. Now it is saying there are no changes to commit so I changed the value of one of the prop's height by 1. I just want to make sure you guys get allthe changes I made today.
Merge pull request #53 from rcatlin/evacuate-when-shooter-nearby

Evacuate when shooter nearby