diff --git a/Assets/Plugins/x86/MengeCore.dll b/Assets/Plugins/x86/MengeCore.dll index 1ec54d2..fd38495 100644 Binary files a/Assets/Plugins/x86/MengeCore.dll and b/Assets/Plugins/x86/MengeCore.dll differ diff --git a/Assets/Plugins/x86/MengeCore_old.dll b/Assets/Plugins/x86/MengeCore_old.dll new file mode 100644 index 0000000..1ec54d2 Binary files /dev/null and b/Assets/Plugins/x86/MengeCore_old.dll differ diff --git a/Assets/Plugins/x86/MengeCore_old.dll.meta b/Assets/Plugins/x86/MengeCore_old.dll.meta new file mode 100644 index 0000000..d33c926 --- /dev/null +++ b/Assets/Plugins/x86/MengeCore_old.dll.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 417be0b37ef8c1b4cbde5fe92e7d1fab +timeCreated: 1494310534 +licenseType: Free +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Any: + second: + enabled: 1 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: x86 + DefaultValueInitialized: true + data: + first: + Facebook: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Linux + second: + enabled: 1 + settings: + CPU: x86 + data: + first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: + CPU: x86 + data: + first: + Standalone: OSXIntel + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXIntel64 + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: x86 + data: + first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/x86_64/MengeCore.dll b/Assets/Plugins/x86_64/MengeCore.dll index 055a398..7271f20 100644 Binary files a/Assets/Plugins/x86_64/MengeCore.dll and b/Assets/Plugins/x86_64/MengeCore.dll differ diff --git a/Assets/Plugins/x86_64/MengeCore_old.dll b/Assets/Plugins/x86_64/MengeCore_old.dll new file mode 100644 index 0000000..055a398 Binary files /dev/null and b/Assets/Plugins/x86_64/MengeCore_old.dll differ diff --git a/Assets/Plugins/x86_64/MengeCore_old.dll.meta b/Assets/Plugins/x86_64/MengeCore_old.dll.meta new file mode 100644 index 0000000..dff3cca --- /dev/null +++ b/Assets/Plugins/x86_64/MengeCore_old.dll.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: fca53eab789554d4ebec0ac5a9ee07d9 +timeCreated: 1494310534 +licenseType: Free +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Any: + second: + enabled: 1 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: x86_64 + DefaultValueInitialized: true + data: + first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: None + data: + first: + Facebook: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: Linux + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: x86_64 + data: + first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: + CPU: x86_64 + data: + first: + Standalone: OSXIntel + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: OSXIntel64 + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: x86_64 + data: + first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MengeCS.dll b/Assets/Scripts/MengeCS.dll index 19b68fe..ebf5368 100644 Binary files a/Assets/Scripts/MengeCS.dll and b/Assets/Scripts/MengeCS.dll differ diff --git a/Assets/Scripts/MengeCS_old.dll b/Assets/Scripts/MengeCS_old.dll new file mode 100644 index 0000000..19b68fe Binary files /dev/null and b/Assets/Scripts/MengeCS_old.dll differ diff --git a/Assets/Scripts/MengeCS_old.dll.meta b/Assets/Scripts/MengeCS_old.dll.meta new file mode 100644 index 0000000..d5ceeca --- /dev/null +++ b/Assets/Scripts/MengeCS_old.dll.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 80084d1ecbe018a4dab6544a3110412d +timeCreated: 1494310754 +licenseType: Free +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Any: + second: + enabled: 1 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SimController.cs b/Assets/Scripts/SimController.cs index 2178032..b5f553c 100644 --- a/Assets/Scripts/SimController.cs +++ b/Assets/Scripts/SimController.cs @@ -24,7 +24,7 @@ void Start () { Debug.Log ("Starting simulation..."); string demo = "4square"; - string mengeRoot = @"E:\work\projects\menge_fork\"; + string mengeRoot = @"C:\Users\abhaysharma\Documents\GitHub\Menge"; string behavior = String.Format(@"{0}examples\core\{1}\{1}B.xml", mengeRoot, demo); string scene = String.Format(@"{0}examples\core\{1}\{1}S.xml", mengeRoot, demo); Debug.Log ("\tInitialzing sim"); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d542bd2..235604f 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 027070f..ca09a3d 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1 @@ -m_EditorVersion: 5.4.3f1 -m_StandardAssetsVersion: 0 +m_EditorVersion: 5.6.0f3