End of time, player change and character reset
Merge commit '7c89af733255ed19ebc29260504c9eca967b8ed4' into develop
Story fix
Fixed approaches
Merge commit '0e02b969740c3f60f6f7c50a06329ba934732f72' into develop
Added textures
Merge commit '0e02b969740c3f60f6f7c50a06329ba934732f72' into develop
Delays, character stops during approach and looks at talker
collision bits economy class
Merge commit '23c259e2ecfccc243991562539ab01436c337ca1' into develop
Spelling error fix
Merge branch 'develop' of https://github.com/StirfireStudios/ggj2014 into develop
Fixed delay timing and approaches not ending
Merge commit '6de4f93cee65dd0b7d6e6c46c86e2fb1ea3c6880' into develop
add credits and start scene
Merge commit '6de4f93cee65dd0b7d6e6c46c86e2fb1ea3c6880' into develop
Fade in/out on character change
Merge commit '9686023a5e07ed27d3d14c1f40e6d939d356a6f8' into develop
Prop placed
Game end