Skip to content

Commit 65fc222

Browse files
CrowdedlightCrowdedlight
committed
Merge branch 'release/1.0.5'
2 parents 052f53e + 42ad23a commit 65fc222

File tree

50 files changed

+113464
-324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+113464
-324
lines changed

‎Configs/Editor/ActionLists/Context/TempEdit.conf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
SCR_EditorActionList {
2+
m_Actions {
3+
ODIN_TeleportToSquadmateContextAction "{5DB755396BAD8347}" {
4+
m_Info SCR_UIInfo "{5DB755397F2426B9}" {
5+
Name "#ODIN-ActionList_TeleportToSquadmate_Name"
6+
Description "#ODIN-ActionList_TeleportToSquadmate_Description"
7+
Icon "{F0E0F66182733D39}UI/Textures/Editor/ContextMenu/ContextAction_Teleport_Player.edds"
8+
}
9+
m_iOrder 200
10+
m_bEnableShortcutLogics 0
11+
m_bShowOnCooldownNotification 0
12+
}
13+
}
14+
}

‎Configs/Editor/ActionLists/Context/TempEdit.conf.meta

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
MetaFileClass {
2+
Name "{2C1D87DE93C77A27}Configs/Editor/ActionLists/Context/TempEdit.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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,35 @@ SCR_EditorAttributeList {
88
m_CategoryConfig "{8A757725BEAC5B36}Configs/Editor/AttributeCategories/Character.conf"
99
m_Layout "{D0F3CE0C63A5AEBB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Checkbox.layout"
1010
}
11+
ODIN_ToggleDamageVehicleAttribute "{5DB0F3FD83111076}" {
12+
m_UIInfo SCR_EditorAttributeUIInfo "{5DB0F3FD8108C6AB}" {
13+
Name "#ODIN-Editor_Attribute_EnableDamage_Name"
14+
}
15+
m_CategoryConfig "{7FA3F309CBFCDACF}Configs/Editor/AttributeCategories/Vehicle.conf"
16+
m_Layout "{D0F3CE0C63A5AEBB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Checkbox.layout"
17+
}
18+
ODIN_ToggleVisibilityEditorAttribute "{5D955C21A940FB32}" {
19+
m_UIInfo SCR_EditorAttributeUIInfo "{5D955C21B533D246}" {
20+
Name "#ODIN-Editor_Attribute_VisibilityToggle_Name"
21+
}
22+
m_CategoryConfig "{8A757725BEAC5B36}Configs/Editor/AttributeCategories/Character.conf"
23+
m_Layout "{D0F3CE0C63A5AEBB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Checkbox.layout"
24+
m_aWhiteListEntityTypes {
25+
2
26+
}
27+
m_aBlackListEntityTypes {
28+
}
29+
}
30+
ODIN_ToggleVisibilityVehicleEditorAttribute "{5D9D720ACEF81609}" {
31+
m_UIInfo SCR_EditorAttributeUIInfo "{5D9D720AD345FC3C}" {
32+
Name "#ODIN-Editor_Attribute_VisibilityToggle_Name"
33+
}
34+
m_CategoryConfig "{7FA3F309CBFCDACF}Configs/Editor/AttributeCategories/Vehicle.conf"
35+
m_Layout "{D0F3CE0C63A5AEBB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Checkbox.layout"
36+
m_aWhiteListEntityTypes {
37+
3
38+
}
39+
}
1140
ODIN_SkillEditorAttribute "{597D1A3551570E9A}" {
1241
m_UIInfo SCR_EditorAttributeUIInfo "{597D1A355FEEF7AE}" {
1342
Name "#ODIN-Editor_Attribute_Skill_Name"

‎Configs/Editor/PlaceableEntities/Systems/Systems.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
SCR_PlaceableEntitiesRegistry {
2+
m_Prefabs +{
3+
"{32044DD6C2ABD643}PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_M15AT.et"
4+
"{ED80D725A6D4D08D}PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_TM62M.et"
5+
}
6+
}

‎Configs/Editor/PlaceableEntities/Systems/Systems.conf.meta

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
MetaFileClass {
2+
Name "{3A9124B8692C3F39}Configs/Editor/PlaceableEntities/Systems/Systems.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/System/chimeraMenus.conf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
MenuManager {
2+
MenuPresets {
3+
MenuPreset ODIN_Listbox_SingleSelect_ID {
4+
Layout "{73A9C9284FFE3376}UI/layouts/ODIN_ListBox_SingleSelect.layout"
5+
Class "ODIN_ListboxSingleSelectDialog"
6+
}
7+
}
8+
}

‎Configs/System/chimeraMenus.conf.meta

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
MetaFileClass {
2+
Name "{C747AFB6B750CE9A}Configs/System/chimeraMenus.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+
}

‎Language/OdinZeus_localization.st.st renamed to ‎Language/OdinZeus_localization.st

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,40 @@
11
StringTable {
22
ItemClassName "CustomStringTableItem"
33
Items {
4+
CustomStringTableItem "{5DC552DCD58C02A3}" {
5+
Id "ODIN-ActionList_TeleportToSquadmate_Description"
6+
Target_en_us "Teleport unit to one of its squadmates"
7+
Target_fr_fr "Téléporter l'unité à l'un de ses coéquipiers"
8+
Target_it_it "Teletrasporta l'unità a uno dei suoi compagni di squadra"
9+
Target_de_de "Teleportiere die Einheit zu einem seiner Kameraden"
10+
Target_es_es "Unidad de teletransporte a uno de sus compañeros de escuadrón"
11+
Target_cs_cz "Teleportujte jednotku k jednomu z jejích spolubojovníci"
12+
Target_pl_pl "Teleportuj jednostkę do jednego z członków jej drużyny"
13+
Target_ru_ru "Телепортировать юнит к одному из его товарищей по отряду"
14+
Target_ja_jp "ユニットを分隊メンバーの一人にテレポートする"
15+
Target_ko_kr "유닛을 분대원 중 한 명에게 텔레포트합니다."
16+
Target_zh_cn "将单位传送至其一名队员处"
17+
Modified 1575019898
18+
Author "crow"
19+
LastChanged "kexanone"
20+
}
21+
CustomStringTableItem "{5DC552DCFF58F14E}" {
22+
Id "ODIN-ActionList_TeleportToSquadmate_Name"
23+
Target_en_us "Teleport To Squadmate"
24+
Target_fr_fr "Téléportation vers un coéquipier"
25+
Target_it_it "Teletrasporta al compagno di squadra"
26+
Target_de_de "Zum Kameraden teleportieren"
27+
Target_es_es "Teletransportarse a compañero de escuadrón"
28+
Target_cs_cz "Teleportujte se ke spolubojovníci"
29+
Target_pl_pl "Teleportuj się do członka drużyny"
30+
Target_ru_ru "Телепортироваться к товарищу по отряду"
31+
Target_ja_jp "分隊へテレポート"
32+
Target_ko_kr "분대원에게 텔레포트"
33+
Target_zh_cn "传送至队友"
34+
Modified 1575019335
35+
Author "crow"
36+
LastChanged "kexanone"
37+
}
438
CustomStringTableItem "{5D19597480C39F02}" {
539
Id "ODIN-EditableEntity_AIWaypoint_Cycle_Name"
640
Target_en_us "CYCLE"
@@ -523,6 +557,24 @@ StringTable {
523557
ImageLink ""
524558
Hidden 0
525559
}
560+
CustomStringTableItem "{5D955C2079184639}" {
561+
Id "ODIN-Editor_Attribute_VisibilityToggle_Name"
562+
Target_en_us "Visibility"
563+
Target_fr_fr "Visibilité"
564+
Target_it_it "Visibilità"
565+
Target_de_de "Sichtbarkeit"
566+
Target_es_es "Visibilidad"
567+
Target_cs_cz "Viditelnost"
568+
Target_pl_pl "Widoczność"
569+
Target_ru_ru "Видимость"
570+
Target_ja_jp "可視性"
571+
Target_ko_kr "가시거리"
572+
Target_pt_br "Visibilidade"
573+
Target_zh_cn "可見度"
574+
Modified 1575018999
575+
Author "crow"
576+
LastChanged "kexanone"
577+
}
526578
CustomStringTableItem "{5D19597480C380D1}" {
527579
Id "ODIN-Editor_AttributeCategory_Waypoint_Name"
528580
Target_en_us "Waypoint"
@@ -552,5 +604,41 @@ StringTable {
552604
ImageLink ""
553605
Hidden 0
554606
}
607+
CustomStringTableItem "{5DC552DA2913D62A}" {
608+
Id "ODIN-UI_Listbox_OnCancel"
609+
Target_en_us "Cancel"
610+
Target_fr_fr "Annuler"
611+
Target_it_it "Annulla"
612+
Target_de_de "Abbrechen"
613+
Target_es_es "Cancelar"
614+
Target_cs_cz "Zrušit"
615+
Target_pl_pl "Anuluj"
616+
Target_ru_ru "Отмена"
617+
Target_ja_jp "キャンセル"
618+
Target_ko_kr "취소"
619+
Target_pt_br "Cancelar"
620+
Target_zh_cn "取消"
621+
Modified 1575018579
622+
Author "crow"
623+
LastChanged "kexanone"
624+
}
625+
CustomStringTableItem "{5DC552DA2D2CBC68}" {
626+
Id "ODIN-UI_Listbox_OnConfirm"
627+
Target_en_us "Confirm"
628+
Target_fr_fr "Confirmer"
629+
Target_it_it "Confermar"
630+
Target_de_de "Bestätigen"
631+
Target_es_es "Confirmar"
632+
Target_cs_cz "Potvrdit"
633+
Target_pl_pl "Potwierdź"
634+
Target_ru_ru "Подтвердить"
635+
Target_ja_jp "確定"
636+
Target_ko_kr "확인"
637+
Target_pt_br "Confirmar"
638+
Target_zh_cn "確認"
639+
Modified 1575018908
640+
Author "crow"
641+
LastChanged "kexanone"
642+
}
555643
}
556644
}

‎Language/OdinZeus_localization.st.st.meta renamed to ‎Language/OdinZeus_localization.st.meta

File renamed without changes.

‎PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_M15AT.et

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
GenericEntity : "{49FFE8F373F55960}Prefabs/Weapons/Explosives/Mine_M15AT/Mine_M15AT.et" {
2+
ID "5968D2B6A82C6019"
3+
components {
4+
BaseTriggerComponent "{59E4E69D8E9B4323}" {
5+
}
6+
SCR_EditableSystemComponent "{5D9202CFB416EBCC}" {
7+
m_EntityType SYSTEM
8+
m_UIInfo SCR_EditableEntityUIInfo "{5D9202CFB1485B6F}" {
9+
Name "#AR-Weapon_M15_Name"
10+
Description "#AR-Weapon_M15_Description"
11+
Icon "{1FBE76E25DDFB65C}UI/Textures/Editor/EditableEntities/Systems/EditableEntity_System_ZoneRestriction.edds"
12+
m_Image "{CD6EDD2DB7E02594}UI/Textures/EditorPreviews/Weapons/Explosives/ODIN_E_Mine_M15AT.edds"
13+
m_sFaction "US"
14+
m_aAuthoredLabels {
15+
38
16+
}
17+
m_aAutoLabels {
18+
11 7 120
19+
}
20+
m_EntityBudgetCost {
21+
SCR_EntityBudgetValue "{5D9202CFCE4653FF}" {
22+
m_BudgetType SYSTEMS
23+
m_Value 4
24+
}
25+
}
26+
}
27+
m_bAutoRegister ALWAYS
28+
}
29+
SCR_PressureTriggerComponent "{59E6BE151DCC9953}" {
30+
m_bLive 1
31+
}
32+
}
33+
}

0 commit comments

Comments
 (0)