Skip to content

Commit

Permalink
Merge branch 'release/1.0.2' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Crowdedlight committed Jun 5, 2022
2 parents a1b51eb + 41939e1 commit a93bcc7
Show file tree
Hide file tree
Showing 77 changed files with 3,507 additions and 57 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.rdb
Language/*.conf*
12 changes: 12 additions & 0 deletions Configs/Editor/ActionLists/Command/Command.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
SCR_EditorActionList {
m_Actions {
SCR_WaypointBaseCommandAction "{59821417789A5A8F}" {
m_Info SCR_UIInfo "{59821416858B2952}" {
Name "#ODIN-EditableEntity_AIWaypoint_Cycle_Name"
Icon "{2373DD0E0D31AF81}UI/Textures/Editor/Toolbar/Commanding/Toolbar_Commanding_Waypoint_Cycle.edds"
}
m_ActionGroup COMMAND_WAYPOINT
m_CommandPrefab "{0FBDE34BE96FB7BA}PrefabsEditable/Auto/AI/Waypoints/E_AIWaypointCycle2.et"
}
}
}
15 changes: 15 additions & 0 deletions Configs/Editor/ActionLists/Command/Command.conf.meta
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
MetaFileClass {
Name "{658F6DBE4AFAFA23}Configs/Editor/ActionLists/Command/Command.conf"
Configurations {
CONFResourceClass PC {
}
CONFResourceClass XBOX_ONE : PC {
}
CONFResourceClass XBOX_SERIES : PC {
}
CONFResourceClass PS4 : PC {
}
CONFResourceClass HEADLESS : PC {
}
}
}
6 changes: 3 additions & 3 deletions Configs/Editor/ActionLists/Context/Shared.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ SCR_EditorActionList {
}
ODIN_DeleteAllDeadContextAction "{5964E09FC10060EB}" {
m_Info SCR_UIInfo "{5964E09FA7A39A68}" {
Name "Delete All Dead"
Description "Deletes all dead bodies"
Icon "{80103D897CF607F4}Icons/deletedead_atlas.edds"
Name "#ODIN-Editor_ContextAction_DeleteAllDead_Name"
Icon "{80103D897CF607F4}UI/Textures/Editor/ContextMenu/ContextAction_DeleteDead.edds"
}
m_iOrder -50
m_bEnableShortcutLogics 0
m_bIsServer 1
}
}
}
69 changes: 67 additions & 2 deletions Configs/Editor/AttributeLists/Edit.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,77 @@ SCR_EditorAttributeList {
m_aAttributes {
ODIN_ToggleDamageEditorAttribute "{5964E09573BF5AE9}" {
m_UIInfo SCR_EditorAttributeUIInfo "{5964E095742FEEF3}" {
Name "Enable Damage"
Description "Enables or disables damage"
Name "#ODIN-Editor_Attribute_EnableDamage_Name"
m_cDescriptionIconColor 0.947 0.056 0.056 1
}
m_CategoryConfig "{8A757725BEAC5B36}Configs/Editor/AttributeCategories/Character.conf"
m_Layout "{D0F3CE0C63A5AEBB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Checkbox.layout"
}
ODIN_SkillEditorAttribute "{597D1A3551570E9A}" {
m_UIInfo SCR_EditorAttributeUIInfo "{597D1A355FEEF7AE}" {
Name "#ODIN-Editor_Attribute_Skill_Name"
}
m_CategoryConfig "{C952695559974DF0}Configs/Editor/AttributeCategories/Group.conf"
m_Layout "{680E4985E42137FB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Slider.layout"
m_baseValues SCR_EditorAttributeBaseValues "{596A3E8215167FD1}" {
m_sSliderValueFormating ""
m_iDecimals 0
}
}
ODIN_FormationEditorAttribute "{597D1A366E75925B}" {
m_UIInfo SCR_EditorAttributeUIInfo "{597D1A366809F471}" {
Name "#ODIN-Editor_Attribute_Formation_Name"
}
m_CategoryConfig "{C952695559974DF0}Configs/Editor/AttributeCategories/Group.conf"
m_Layout "{D1F686225704ADC2}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_ButtonBox_Selection.layout"
m_aValues {
SCR_EditorAttributeFloatStringValueHolder "{596A4C7C23D956EA}" {
m_Icon "{618827C6C32E294E}UI/Textures/Editor/Attributes/Group/Attribute_Group_Wedge.edds"
m_sEntryName "#ODIN-Editor_Attribute_Formation_Wedge_Name"
}
SCR_EditorAttributeFloatStringValueHolder "{596A4C7C2010F35C}" {
m_Icon "{C7B09DD7B2ECC7F7}UI/Textures/Editor/Attributes/Group/Attribute_Group_Column.edds"
m_sEntryName "#ODIN-Editor_Attribute_Formation_Column_Name"
m_fEntryFloatValue 1
}
SCR_EditorAttributeFloatStringValueHolder "{596A4C7C20419704}" {
m_Icon "{34B57A1935BC9CA5}UI/Textures/Editor/Attributes/Group/Attribute_Group_StaggeredColumn.edds"
m_sEntryName "#ODIN-Editor_Attribute_Formation_StaggeredColumn_Name"
m_fEntryFloatValue 2
}
SCR_EditorAttributeFloatStringValueHolder "{596A4C7C2107EBF1}" {
m_Icon "{5B00ECEED1286BB9}UI/Textures/Editor/Attributes/Group/Attribute_Group_Line.edds"
m_sEntryName "#ODIN-Editor_Attribute_Formation_Line_Name"
m_fEntryFloatValue 3
}
}
m_iButtonsOnRow 5
m_fButtonHeight 90
}
ODIN_StanceEditorAttribute "{597D1A366D92E8C4}" {
m_UIInfo SCR_EditorAttributeUIInfo "{597D1A3676DBE9F7}" {
Name "#ODIN-Editor_Attribute_Stance_Name"
}
m_CategoryConfig "{C952695559974DF0}Configs/Editor/AttributeCategories/Group.conf"
m_Layout "{D1F686225704ADC2}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_ButtonBox_Selection.layout"
m_aValues {
SCR_EditorAttributeFloatStringValueHolder "{596D5D1013D4F304}" {
m_Icon "{D9E917BE8B131338}UI/Textures/Editor/Attributes/Group/Attribute_Group_Stand.edds"
m_sEntryName "#ODIN-Editor_Attribute_Stance_Stand_Name"
}
SCR_EditorAttributeFloatStringValueHolder "{596D5D10109ED7E1}" {
m_Icon "{19EBDE1312E19F60}UI/Textures/Editor/Attributes/Group/Attribute_Group_Crouch.edds"
m_sEntryName "#ODIN-Editor_Attribute_Stance_Crouch_Name"
m_fEntryFloatValue 1
}
SCR_EditorAttributeFloatStringValueHolder "{596D5D1010C365D2}" {
m_Icon "{E30B4D5B0CA398E9}UI/Textures/Editor/Attributes/Group/Attribute_Group_Prone.edds"
m_sEntryName "#ODIN-Editor_Attribute_Stance_Prone_Name"
m_fEntryFloatValue 2
}
}
m_iButtonsOnRow 5
m_fButtonHeight 90
}
}
}
5 changes: 5 additions & 0 deletions Configs/Editor/PlaceableEntities/Systems/Command.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
SCR_PlaceableEntitiesRegistry {
m_Prefabs + {
"{0FBDE34BE96FB7BA}PrefabsEditable/Auto/AI/Waypoints/E_AIWaypointCycle.et"
}
}
15 changes: 15 additions & 0 deletions Configs/Editor/PlaceableEntities/Systems/Command.conf.meta
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
MetaFileClass {
Name "{7FB652F153A020F4}Configs/Editor/PlaceableEntities/Systems/Command.conf"
Configurations {
CONFResourceClass PC {
}
CONFResourceClass XBOX_ONE : PC {
}
CONFResourceClass XBOX_SERIES : PC {
}
CONFResourceClass PS4 : PC {
}
CONFResourceClass HEADLESS : PC {
}
}
}
17 changes: 0 additions & 17 deletions Icons/deletedead.imageset

This file was deleted.

15 changes: 0 additions & 15 deletions Icons/deletedead.imageset.meta

This file was deleted.

15 changes: 0 additions & 15 deletions Icons/deletedead_atlas.edds.meta

This file was deleted.

Loading

0 comments on commit a93bcc7

Please sign in to comment.