Merge branch 'master' of github.com:rcatlin/Emergency-Response into locked-door-barriers
I made some changes to the objective messages so they no longer give the player any direction. Now they just say Run Hide Fight. I also fixed some bugs that were preventing the hiding place from appearing. Finally I added a front door so the player can actually win by running out of the building.
I changed the modals that pop up in the original classroom to conversations. I adjusted some timers and added a few things to make everything run smoother. I also deleted a trigger that was duplicating material and is no longer needed
merge master, conflicts
submodule update
Changed the objectives to 'choose what to do: run hide fight
trying to resolve merge conflicts..
Merge pull request #119 from rcatlin/change-modals-to-conversations

Change modals to conversations