Skip to content
  • mmaluschnig's avatar
    Merge branch 'piethrowing' · c17fbfae
    mmaluschnig authored
    * piethrowing:
      Simon's dialogue done
      Added boing to Trapeze and -5 seconds of time when hit trampoline
      Started Simon's dialogue
      Finished Tarantella, added music to Pie Throwing and Trapeze
    
    # Conflicts:
    #	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
    #	RingMaster/RingMaster/Assets/Scenes/TrapezeTutorial.unity
    c17fbfae