Merge branch 'release/1.0.3'

zen-mod · Apr 12, 2023 · c31590c · c31590c
2 parents a93bcc7 + f33aa56
commit c31590c
Show file tree

Hide file tree

Showing 24 changed files with 2,343 additions and 1,755 deletions.
diff --git a/Configs/Editor/ActionLists/Context/Shared.conf b/Configs/Editor/ActionLists/Context/Shared.conf
@@ -2,14 +2,5 @@ SCR_EditorActionList {
  m_Actions {
   SCR_TeleportCameraContextAction "{52507AEE63A83388}" {
   }
-  ODIN_DeleteAllDeadContextAction "{5964E09FC10060EB}" {
-   m_Info SCR_UIInfo "{5964E09FA7A39A68}" {
-    Name "#ODIN-Editor_ContextAction_DeleteAllDead_Name"
-    Icon "{80103D897CF607F4}UI/Textures/Editor/ContextMenu/ContextAction_DeleteDead.edds"
-   }
-   m_iOrder -50
-   m_bEnableShortcutLogics 0
-   m_bIsServer 1
-  }
  }
 }
diff --git a/Configs/Editor/AttributeCategories/Waypoint.conf b/Configs/Editor/AttributeCategories/Waypoint.conf
@@ -0,0 +1,7 @@
+SCR_EditorAttributeCategory {
+ m_UIInfo SCR_UIInfo "{59916BDD75F1B1D0}" {
+  Name "#ODIN-Editor_AttributeCategory_Waypoint_Name"
+  Icon "{2006D8738EA93571}UI/Textures/Editor/Toolbar/Commanding/Toolbar_Commanding_Waypoint_Move.edds"
+ }
+ m_iPriority 100
+}
diff --git a/Configs/Editor/AttributeCategories/Waypoint.conf.meta b/Configs/Editor/AttributeCategories/Waypoint.conf.meta
@@ -0,0 +1,15 @@
+MetaFileClass {
+ Name "{A16BBA8270489FA0}Configs/Editor/AttributeCategories/Waypoint.conf"
+ Configurations {
+  CONFResourceClass PC {
+  }
+  CONFResourceClass XBOX_ONE : PC {
+  }
+  CONFResourceClass XBOX_SERIES : PC {
+  }
+  CONFResourceClass PS4 : PC {
+  }
+  CONFResourceClass HEADLESS : PC {
+  }
+ }
+}
diff --git a/Configs/Editor/AttributeLists/Edit.conf b/Configs/Editor/AttributeLists/Edit.conf
@@ -53,7 +53,7 @@ SCR_EditorAttributeList {
    m_UIInfo SCR_EditorAttributeUIInfo "{597D1A3676DBE9F7}" {
     Name "#ODIN-Editor_Attribute_Stance_Name"
    }
-   m_CategoryConfig "{C952695559974DF0}Configs/Editor/AttributeCategories/Group.conf"
+   m_CategoryConfig "{8A757725BEAC5B36}Configs/Editor/AttributeCategories/Character.conf"
    m_Layout "{D1F686225704ADC2}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_ButtonBox_Selection.layout"
    m_aValues {
     SCR_EditorAttributeFloatStringValueHolder "{596D5D1013D4F304}" {
@@ -74,5 +74,39 @@ SCR_EditorAttributeList {
    m_iButtonsOnRow 5
    m_fButtonHeight 90
   }
+  ODIN_CompletionRadiusEditorAttribute "{59916BDD2CF29127}" {
+   m_UIInfo SCR_EditorAttributeUIInfo "{59916BDD2B883379}" {
+    Name "#ODIN-Editor_Attribute_CompletionRadius_Name"
+   }
+   m_CategoryConfig "{A16BBA8270489FA0}Configs/Editor/AttributeCategories/Waypoint.conf"
+   m_Layout "{680E4985E42137FB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Slider.layout"
+   m_baseValues SCR_EditorAttributeBaseValues "{59916BDD3EC05B0B}" {
+    m_sSliderValueFormating "#ODIN-Editor_Attribute_CompletionRadius_ValueFormating"
+    m_fMin 1
+    m_fMax 50
+    m_fStep 1
+    m_iDecimals 0
+   }
+  }
+  ODIN_CompletionTypeEditorAttribute "{5993694CDB9EE4A9}" {
+   m_UIInfo SCR_EditorAttributeUIInfo "{5993694CE227248D}" {
+    Name "#ODIN-Editor_Attribute_CompletionType_Name"
+   }
+   m_CategoryConfig "{A16BBA8270489FA0}Configs/Editor/AttributeCategories/Waypoint.conf"
+   m_Layout "{2ECAE6EA5F6855C9}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Dropdown.layout"
+   m_aValues {
+    SCR_EditorAttributeFloatStringValueHolder "{5993694C0B3D78F9}" {
+     m_sEntryName "#ODIN-Editor_Attribute_CompletionType_All_Name"
+    }
+    SCR_EditorAttributeFloatStringValueHolder "{5993694C1DCF4693}" {
+     m_sEntryName "#ODIN-Editor_Attribute_CompletionType_Leader_Name"
+     m_fEntryFloatValue 1
+    }
+    SCR_EditorAttributeFloatStringValueHolder "{5993694C1A306DCC}" {
+     m_sEntryName "#ODIN-Editor_Attribute_CompletionType_Any_Name"
+     m_fEntryFloatValue 2
+    }
+   }
+  }
  }
 }