68d0ac9c37
# Conflicts: # Assets/Resources/Scenes/Level1.unity |
||
---|---|---|
.. | ||
Art | ||
Editor | ||
Scenes | ||
Standard Assets | ||
Text | ||
Art.meta | ||
CharacterMovement.cs | ||
CharacterMovement.cs.meta | ||
Editor.meta | ||
GuardLogic.cs | ||
GuardLogic.cs.meta | ||
Scenes.meta | ||
Standard Assets.meta | ||
Text.meta | ||
TextBoxManager.cs | ||
TextBoxManager.cs.meta | ||
TextImporter.cs | ||
TextImporter.cs.meta |