GitLab

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  Now Ahava levels slower than the other characters.
  Added game control Easter egg dialogue
  Created README

# Conflicts:
#	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml

# Conflicts:
#	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  Fixed Mime Mime miss hits.

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  Player now can't leave the circus.
  Fixed exclamation marks not showing on characters correctly upon level up.

* piethrowing:
  Tidied up Ahava's dialogue
  Finished dialogue
  Added muffled music to intro scene, started tidying up/finishing dialogue

# Conflicts:
#	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
#	RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs

* simonthebear:
  Mime mime tutorial improved.
  take this, it's dangerous to go alone.

# Conflicts:
#	RingMaster/RingMaster/ProjectSettings/ProjectVersion.txt

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  Saved the scene kappa.

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  mime mime is balanced?

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  textmeta, please no break.

* 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