Merge remote-tracking branch 'origin/NewStory' into NewStory
# Conflicts: # Assets/Scenes/Land_01/Land_Of_Death_Demo.unity
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
// Copyright (c) Pixel Crushers. All rights reserved.
|
// Copyright (c) Pixel Crushers. All rights reserved.
|
||||||
|
|
||||||
using UnityEditor.Localization.Platform.iOS;
|
//using UnityEditor.Localization.Platform.iOS;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace PixelCrushers.DialogueSystem.Wrappers
|
namespace PixelCrushers.DialogueSystem.Wrappers
|
||||||
|
|||||||
Reference in New Issue
Block a user