no message
no message
Merge branch 'master' of https://github.com/phelow/FallOfTheTzar

Conflicts:
	FallOfTheTzar/Assets/TBTK/TBTK (Base)/ScenesDefaultUI/TerrianTropic.asset
no message
no message
no message
Added the test database which only contains the first scene. Once I have the key I can start using this to get scene one into the game.  After that works I'll switch to the full database.
Merge branch 'master' of https://github.com/phelow/FallOfTheTzar
Added dialogue using a temporary UI
Disabling gameplay during conversations is not yet working - will be addressed at pre - Preliminary meeting.
Merge branch 'NEW_UI' of https://github.com/phelow/FallOfTheTzar

Conflicts:
	FallOfTheTzar/ProjectSettings/ProjectSettings.asset
no message
Merge branch 'master' of https://github.com/phelow/FallOfTheTzar

Conflicts:
	FallOfTheTzar/Assets/Scenes/Level/LevelFour_2.unity
Merge remote-tracking branch 'origin/NEW_UI'

Conflicts:
	FallOfTheTzar/Assets/Scenes/Level/LevelOne.unity
	FallOfTheTzar/ProjectSettings/ProjectSettings.asset
Merge branch 'NEW_UI' of https://github.com/phelow/FallOfTheTzar
Merge branch 'master' of https://github.com/phelow/FallOfTheTzar

Conflicts:
	FallOfTheTzar/FallOfTheTzar.userprefs
no message
Merge branch 'NEW_UI' of https://github.com/phelow/FallOfTheTzar

Conflicts:
	FallOfTheTzar/FallOfTheTzar.userprefs
Merge branch 'master' of https://github.com/phelow/FallOfTheTzar

Conflicts:
	FallOfTheTzar/FallOfTheTzar.userprefs