Skip to content

Commit c31590c

Browse files
committed
Merge branch 'release/1.0.3'
2 parents a93bcc7 + f33aa56 commit c31590c

24 files changed

+2343
-1755
lines changed

Configs/Editor/ActionLists/Context/Shared.conf

-9
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,5 @@ SCR_EditorActionList {
22
m_Actions {
33
SCR_TeleportCameraContextAction "{52507AEE63A83388}" {
44
}
5-
ODIN_DeleteAllDeadContextAction "{5964E09FC10060EB}" {
6-
m_Info SCR_UIInfo "{5964E09FA7A39A68}" {
7-
Name "#ODIN-Editor_ContextAction_DeleteAllDead_Name"
8-
Icon "{80103D897CF607F4}UI/Textures/Editor/ContextMenu/ContextAction_DeleteDead.edds"
9-
}
10-
m_iOrder -50
11-
m_bEnableShortcutLogics 0
12-
m_bIsServer 1
13-
}
145
}
156
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
SCR_EditorAttributeCategory {
2+
m_UIInfo SCR_UIInfo "{59916BDD75F1B1D0}" {
3+
Name "#ODIN-Editor_AttributeCategory_Waypoint_Name"
4+
Icon "{2006D8738EA93571}UI/Textures/Editor/Toolbar/Commanding/Toolbar_Commanding_Waypoint_Move.edds"
5+
}
6+
m_iPriority 100
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
MetaFileClass {
2+
Name "{A16BBA8270489FA0}Configs/Editor/AttributeCategories/Waypoint.conf"
3+
Configurations {
4+
CONFResourceClass PC {
5+
}
6+
CONFResourceClass XBOX_ONE : PC {
7+
}
8+
CONFResourceClass XBOX_SERIES : PC {
9+
}
10+
CONFResourceClass PS4 : PC {
11+
}
12+
CONFResourceClass HEADLESS : PC {
13+
}
14+
}
15+
}

Configs/Editor/AttributeLists/Edit.conf

+35-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ SCR_EditorAttributeList {
5353
m_UIInfo SCR_EditorAttributeUIInfo "{597D1A3676DBE9F7}" {
5454
Name "#ODIN-Editor_Attribute_Stance_Name"
5555
}
56-
m_CategoryConfig "{C952695559974DF0}Configs/Editor/AttributeCategories/Group.conf"
56+
m_CategoryConfig "{8A757725BEAC5B36}Configs/Editor/AttributeCategories/Character.conf"
5757
m_Layout "{D1F686225704ADC2}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_ButtonBox_Selection.layout"
5858
m_aValues {
5959
SCR_EditorAttributeFloatStringValueHolder "{596D5D1013D4F304}" {
@@ -74,5 +74,39 @@ SCR_EditorAttributeList {
7474
m_iButtonsOnRow 5
7575
m_fButtonHeight 90
7676
}
77+
ODIN_CompletionRadiusEditorAttribute "{59916BDD2CF29127}" {
78+
m_UIInfo SCR_EditorAttributeUIInfo "{59916BDD2B883379}" {
79+
Name "#ODIN-Editor_Attribute_CompletionRadius_Name"
80+
}
81+
m_CategoryConfig "{A16BBA8270489FA0}Configs/Editor/AttributeCategories/Waypoint.conf"
82+
m_Layout "{680E4985E42137FB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Slider.layout"
83+
m_baseValues SCR_EditorAttributeBaseValues "{59916BDD3EC05B0B}" {
84+
m_sSliderValueFormating "#ODIN-Editor_Attribute_CompletionRadius_ValueFormating"
85+
m_fMin 1
86+
m_fMax 50
87+
m_fStep 1
88+
m_iDecimals 0
89+
}
90+
}
91+
ODIN_CompletionTypeEditorAttribute "{5993694CDB9EE4A9}" {
92+
m_UIInfo SCR_EditorAttributeUIInfo "{5993694CE227248D}" {
93+
Name "#ODIN-Editor_Attribute_CompletionType_Name"
94+
}
95+
m_CategoryConfig "{A16BBA8270489FA0}Configs/Editor/AttributeCategories/Waypoint.conf"
96+
m_Layout "{2ECAE6EA5F6855C9}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Dropdown.layout"
97+
m_aValues {
98+
SCR_EditorAttributeFloatStringValueHolder "{5993694C0B3D78F9}" {
99+
m_sEntryName "#ODIN-Editor_Attribute_CompletionType_All_Name"
100+
}
101+
SCR_EditorAttributeFloatStringValueHolder "{5993694C1DCF4693}" {
102+
m_sEntryName "#ODIN-Editor_Attribute_CompletionType_Leader_Name"
103+
m_fEntryFloatValue 1
104+
}
105+
SCR_EditorAttributeFloatStringValueHolder "{5993694C1A306DCC}" {
106+
m_sEntryName "#ODIN-Editor_Attribute_CompletionType_Any_Name"
107+
m_fEntryFloatValue 2
108+
}
109+
}
110+
}
77111
}
78112
}

0 commit comments

Comments
 (0)