Modified Conversation Bubble and Atlas prefabs
Modified Conversation Bubble and Atlas prefabs
Merge branch 'alim4' of https://github.com/JohnMai/WhiteSharks into alim4
Modified Conversation Bubble and Atlas prefabs
Merge branch 'alim4' of https://github.com/JohnMai/WhiteSharks into alim4
FIX: Chair shadows
FIX: Chair shadows
Fixed Atlas
Merge branch 'alim4' of https://github.com/JohnMai/WhiteSharks into alim4
Merge pull request #116 from Kiroshima/master

Updated XML
Added new style conversation, fixed convo bugs

Added a new interface style to the conversation
Fixed some animation bugs in branched choice selection (by removing animations)
Small polish things (not Polish)
Modified Conversation Bubble and Atlas prefabs
Modified Conversation Bubble and Atlas prefabs
Fixed Atlas
Added new style conversation, fixed convo bugs

Added a new interface style to the conversation
Fixed some animation bugs in branched choice selection (by removing animations)
Small polish things (not Polish)
Merge branch 'alim4' of https://github.com/JohnMai/WhiteSharks into alim4

Conflicts:
	Assets/Sprites/Conversation Atlas.prefab
I'm bad at Git
Modified Conversation Bubble and Atlas prefabs
Fixed Atlas
Added new style conversation, fixed convo bugs

Added a new interface style to the conversation
Fixed some animation bugs in branched choice selection (by removing animations)
Small polish things (not Polish)