These are the changes for the 'another character runs bubble'. I made it so that after 5 seconds after the player hides successfully or 40 seconds after they fail one of their objectives a character comes up to them and says 'Im leaving' Once they relock the door, they will win in 5 seconds. So this covers the hide and the win bubble as well
I had the 'shooter far' branch commented out. I fixed it and pushed again
These are most of the changes needed to finish my content. I still want to add a few things, but none of it should be essential for game flow. I'm not sure how Scott's 'fight the shooter' content is activated yet so we might still need to add the necessary triggers for activating his content once the player runs from the room.
removed the commented out code that was not needed in getOutOfBuilding.js and uncommented the code that was needed in activateShooter.js
Added content for student runs past.
Added triggers to start conversations and edited Foo
Added content for student runs past.
grammar
Fixed merge conflicts
Updated runner content so user has 20 seconds to complete it.
Merge remote-tracking branch 'origin/master' into content/runner
Fixed some merge issues
Fixed merge conflicts merge tool missed
Merge remote-tracking branch 'origin/master' into fix/StartConversations
Finished self starting convos for Foo, Xavier, and the Computer
the runner isn't a girl anymore
whoops i broke the cutscene
Merge pull request #117 from rcatlin/fix/StartConversations

Fix/start conversations
fixed image proportions for runner
Added a trigger to keep runner from going through the downed wires.