diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/ActionObjectMenuSceneEditor.prefab b/arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/ActionObjectMenuSceneEditor.prefab index 96bbaaa4d..032068eac 100644 --- a/arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/ActionObjectMenuSceneEditor.prefab +++ b/arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/ActionObjectMenuSceneEditor.prefab @@ -612,7 +612,7 @@ MonoBehaviour: onStateChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 4455020661743965345} m_MethodName: OnMenuStateChanged m_Mode: 1 m_Arguments: @@ -623,18 +623,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_MethodName: OnMenuStateChanged - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 2219791083400178696} - m_ObjectArgumentAssemblyTypeName: DanielLochner.Assets.SimpleSideMenu.SimpleSideMenu, - Assembly-CSharp - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 onStateSelected: m_PersistentCalls: m_Calls: [] @@ -1746,7 +1734,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -3329,7 +3317,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -4070,7 +4058,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -4257,7 +4245,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -4714,11 +4702,6 @@ PrefabInstance: propertyPath: OnEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, - type: 3} - propertyPath: OnEvents.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, type: 3} propertyPath: OffEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -4729,16 +4712,6 @@ PrefabInstance: propertyPath: OffEvents.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, - type: 3} - propertyPath: OffEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, - type: 3} - propertyPath: OnEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, type: 3} propertyPath: OnEvents.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -4759,6 +4732,21 @@ PrefabInstance: propertyPath: OffEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, + type: 3} + propertyPath: OnEvents.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, + type: 3} + propertyPath: OnEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 4455020661743965345} + - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, + type: 3} + propertyPath: OffEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 4455020661743965345} - target: {fileID: 5371841985900859675, guid: 842e373db2ba5004082e835ac120c8a1, type: 3} propertyPath: m_Name @@ -4970,7 +4958,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 4991226775622563084, guid: a37f66d2914458b4c85e50f9fa33cf93, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -5100,7 +5088,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -5286,16 +5274,36 @@ PrefabInstance: propertyPath: description value: Rename action point objectReference: {fileID: 0} + - target: {fileID: 4991226775622563084, guid: a37f66d2914458b4c85e50f9fa33cf93, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4991226775622563084, guid: a37f66d2914458b4c85e50f9fa33cf93, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 4991226775622563084, guid: a37f66d2914458b4c85e50f9fa33cf93, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: ShowRenameDialog objectReference: {fileID: 0} + - target: {fileID: 4991226775622563084, guid: a37f66d2914458b4c85e50f9fa33cf93, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4991226775622563084, guid: a37f66d2914458b4c85e50f9fa33cf93, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4991226775622563084, guid: a37f66d2914458b4c85e50f9fa33cf93, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7710050843114423662, guid: a37f66d2914458b4c85e50f9fa33cf93, type: 3} propertyPath: m_LocalPosition.x @@ -5426,7 +5434,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenuProjectEditor.cs b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenuProjectEditor.cs index 7da15eaff..7fde6394e 100644 --- a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenuProjectEditor.cs +++ b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenuProjectEditor.cs @@ -117,16 +117,6 @@ public void OverrideParameters() { } protected override void UpdateSaveBtn() { - if (SceneManager.Instance.SceneStarted) { - SaveParametersBtn.SetInteractivity(false, "Parameters could be overrided only when scene is stopped."); - return; - } - if (!parametersChanged) { - SaveParametersBtn.SetInteractivity(false, "No parameter changed"); - return; - } - // TODO: add dry run save - SaveParametersBtn.SetInteractivity(true); - + } } diff --git a/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs index cfecf8448..ffc0cb2cc 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs @@ -195,7 +195,7 @@ public class GameManager : Singleton { /// /// Api version /// - public const string ApiVersion = "0.9.1"; + public const string ApiVersion = "0.9.2"; /// /// List of projects metadata /// diff --git a/arcor2_AREditor/Assets/BASE/Scripts/Parameter.cs b/arcor2_AREditor/Assets/BASE/Scripts/Parameter.cs index 074ac487c..fa2f4df2e 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/Parameter.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/Parameter.cs @@ -8,6 +8,7 @@ using System.Globalization; using Michsky.UI.ModernUIPack; using UnityEngine.Events; +using MiniJSON; namespace Base { public class Parameter : IO.Swagger.Model.Parameter { @@ -55,6 +56,9 @@ public Parameter(IO.Swagger.Model.ParameterMeta actionParameterMetadata, object case "double": SetValue((double) value); break; + case "boolean": + SetValue((bool) value); + break; } } @@ -75,6 +79,26 @@ public static T GetValue(string value) { return JsonConvert.DeserializeObject(value); } + public static string Encode(string value, string type) { + switch (type) { + /*case "relative_pose": + return GetValue(value).ToString();*/ + case "integer_enum": + case "integer": + return JsonConvert.SerializeObject(int.Parse(value)); + case "string_enum": + case "pose": + case "joints": + case "string": + return JsonConvert.SerializeObject(value); + case "double": + return JsonConvert.SerializeObject(double.Parse(value)); + case "boolean": + return JsonConvert.SerializeObject(bool.Parse(value)); + } + throw new RequestFailedException("Unknown parameter type (" + type + ")"); + } + public string GetStringValue() { return GetStringValue(Value, Type); } @@ -94,6 +118,8 @@ public static string GetStringValue(string value, string type) { return GetValue(value).ToString(); case "double": return GetValue(value).ToString(); + case "boolean": + return GetValue(value).ToString(); } throw new RequestFailedException("Unknown parameter type"); } @@ -519,7 +545,7 @@ public static DropdownParameter GetDropdownParameter(string param_id, GameObject throw new Base.ItemNotFoundException("Parameter not found: " + param_id); } - private static GameObject InitializeParameter(ParameterMetadata actionParameterMetadata, OnChangeParameterHandlerDelegate handler, VerticalLayoutGroup layoutGroupToBeDisabled, GameObject canvasRoot, string value, bool darkMode = false, string actionProviderId = "") { + public static GameObject InitializeParameter(ParameterMetadata actionParameterMetadata, OnChangeParameterHandlerDelegate handler, VerticalLayoutGroup layoutGroupToBeDisabled, GameObject canvasRoot, string value, bool darkMode = false, string actionProviderId = "") { GameObject parameter = null; switch (actionParameterMetadata.Type) { diff --git a/arcor2_AREditor/Assets/BASE/Scripts/Parameters/ActionObjectParameterOverride.cs b/arcor2_AREditor/Assets/BASE/Scripts/Parameters/ActionObjectParameterOverride.cs index 0c96a2aeb..d6af3df56 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/Parameters/ActionObjectParameterOverride.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/Parameters/ActionObjectParameterOverride.cs @@ -36,15 +36,12 @@ public void Init(string value, bool overriden, ParameterMetadata parameterMetada } public void Modify() { - switch (parameterMetadata.Type) { - case "string": - Input = Parameter.InitializeStringParameter(parameterMetadata, OnChangeParameterHandler, null, null, Value.text); - Input.GetComponent().SetLabel("", ""); - Value.gameObject.SetActive(false); - Input.transform.SetParent(Value.transform.parent); - Input.transform.SetAsFirstSibling(); - break; - } + Input = Parameter.InitializeParameter(parameterMetadata, OnChangeParameterHandler, null, null, Parameter.Encode(Value.text, parameterMetadata.Type), true); + Input.GetComponent().SetLabel("", ""); + Value.gameObject.SetActive(false); + Input.transform.SetParent(Value.transform.parent); + Input.transform.SetAsFirstSibling(); + SaveBtn.gameObject.SetActive(true); ModifyBtn.gameObject.SetActive(false); RestoreBtn.gameObject.SetActive(false); diff --git a/arcor2_AREditor/Assets/BASE/Scripts/Swagger/IO.Swagger.dll b/arcor2_AREditor/Assets/BASE/Scripts/Swagger/IO.Swagger.dll index e1990750b..936484194 100644 Binary files a/arcor2_AREditor/Assets/BASE/Scripts/Swagger/IO.Swagger.dll and b/arcor2_AREditor/Assets/BASE/Scripts/Swagger/IO.Swagger.dll differ diff --git a/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs index bb1c5a007..932d02932 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs @@ -2212,6 +2212,39 @@ public async Task DeleteOverride(string id, IO.Swagger.Model.Parameter parameter } } + + public async Task> InverseKinematics(string robotId, string endEffectorId, bool avoidCollisions, IO.Swagger.Model.Pose pose, List startJoints) { + int r_id = Interlocked.Increment(ref requestID); + IO.Swagger.Model.InverseKinematicsRequestArgs args = new InverseKinematicsRequestArgs(robotId: robotId, + endEffectorId: endEffectorId, pose: pose, avoidCollisions: avoidCollisions, startJoints: startJoints); + + IO.Swagger.Model.InverseKinematicsRequest request = new IO.Swagger.Model.InverseKinematicsRequest(r_id, "InverseKinematics", args: args); + SendDataToServer(request.ToJson(), r_id, true); + IO.Swagger.Model.InverseKinematicsResponse response = await WaitForResult(r_id); + if (response == null || !response.Result) { + throw new RequestFailedException(response == null ? new List() { "Failed to delete override of object parameter" } : response.Messages); + } else { + return response.Data; + } + } + + public async Task ForwardKinematics(string robotId, string endEffectorId, List joints) { + int r_id = Interlocked.Increment(ref requestID); + IO.Swagger.Model.ForwardKinematicsRequestArgs args = new ForwardKinematicsRequestArgs(robotId: robotId, + endEffectorId: endEffectorId, joints: joints); + + IO.Swagger.Model.ForwardKinematicsRequest request = new IO.Swagger.Model.ForwardKinematicsRequest(r_id, "ForwardKinematics", args: args); + SendDataToServer(request.ToJson(), r_id, true); + IO.Swagger.Model.ForwardKinematicsResponse response = await WaitForResult(r_id); + if (response == null || !response.Result) { + throw new RequestFailedException(response == null ? new List() { "Failed to delete override of object parameter" } : response.Messages); + } else { + return response.Data; + } + } + + + } diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index 79679bc1f..73d1c1984 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -3854,12 +3854,12 @@ PrefabInstance: - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.y - value: -17610662 + value: -17579718 objectReference: {fileID: 0} - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.x - value: -84866400 + value: -85460950 objectReference: {fileID: 0} - target: {fileID: 224818740107539070, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} @@ -4395,7 +4395,6 @@ MonoBehaviour: type: 3} TrackingLostAnimation: {fileID: 1311245634} WorldAnchorLocal: {fileID: 0} - WorldAnchorCloud: {fileID: 0} Calibrated: 0 --- !u!114 &1636584856 stripped MonoBehaviour: @@ -10697,7 +10696,7 @@ PrefabInstance: - target: {fileID: 2438502520194330416, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2447050734846494385, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -23707,7 +23706,7 @@ PrefabInstance: - target: {fileID: 6878704463159915577, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00012207031 + value: 0.00024414062 objectReference: {fileID: 0} - target: {fileID: 6880113305988437710, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -25433,7 +25432,7 @@ PrefabInstance: - target: {fileID: 7470386994216100664, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000091552734 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7487050971180503418, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -31736,7 +31735,7 @@ PrefabInstance: - target: {fileID: 8354930472926548299, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000061035156 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8358209683150472652, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33436,7 +33435,7 @@ PrefabInstance: - target: {fileID: 9016423017844879089, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000045776367 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9041916925268103529, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -34716,7 +34715,7 @@ PrefabInstance: - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} propertyPath: m_AnchoredPosition.y - value: 9037891 + value: 9094609 objectReference: {fileID: 0} - target: {fileID: 224880000733725854, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} @@ -38785,7 +38784,7 @@ PrefabInstance: - target: {fileID: 4620524145206687212, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000091552734 + value: -0.00012207031 objectReference: {fileID: 0} - target: {fileID: 4654071109875633369, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/MainScreen.cs b/arcor2_AREditor/Assets/TABLET/Scripts/MainScreen.cs index cf64f35d3..160d2d24c 100644 --- a/arcor2_AREditor/Assets/TABLET/Scripts/MainScreen.cs +++ b/arcor2_AREditor/Assets/TABLET/Scripts/MainScreen.cs @@ -391,7 +391,7 @@ public void UpdatePackages(object sender, EventArgs eventArgs) { bool starred = PlayerPrefsHelper.LoadBool("package/" + package.Id + "/starred", false); string projectName; try { - projectName = GameManager.Instance.GetProjectName(package.ProjectId); + projectName = package.ProjectMeta.Name; } catch (ItemNotFoundException _) { projectName = "unknown"; } @@ -399,8 +399,8 @@ public void UpdatePackages(object sender, EventArgs eventArgs) { async () => await Base.GameManager.Instance.RunPackage(package.Id), () => PackageOptionMenu.Open(tile), starred, - package.Modified, - package.Modified, + package.PackageMeta.Built, + package.PackageMeta.Executed, package.Id, projectName, package.PackageMeta.Built.ToString()); diff --git a/arcor2_AREditor/ProjectSettings/GraphicsSettings.asset b/arcor2_AREditor/ProjectSettings/GraphicsSettings.asset index 765207df2..e80949f94 100644 --- a/arcor2_AREditor/ProjectSettings/GraphicsSettings.asset +++ b/arcor2_AREditor/ProjectSettings/GraphicsSettings.asset @@ -39,7 +39,6 @@ GraphicsSettings: - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 30, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/arcor2_AREditor/ProjectSettings/ProjectSettings.asset b/arcor2_AREditor/ProjectSettings/ProjectSettings.asset index 0b5ffaed4..c33eb35ff 100644 --- a/arcor2_AREditor/ProjectSettings/ProjectSettings.asset +++ b/arcor2_AREditor/ProjectSettings/ProjectSettings.asset @@ -126,7 +126,7 @@ PlayerSettings: 16:10: 1 16:9: 0 Others: 0 - bundleVersion: 0.9.0 + bundleVersion: 0.10.1 preloadedAssets: - {fileID: 11400000, guid: 20a9bcdf4f5308b4cbe95702f502a097, type: 2} metroInputSource: 0 diff --git a/arcor2_AREditor/ProjectSettings/VersionControlSettings.asset b/arcor2_AREditor/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 000000000..dca288142 --- /dev/null +++ b/arcor2_AREditor/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1