Skip to content

Commit 2bb2f81

Browse files
committed
Merge branch 'release/1.0.6'
2 parents 65fc222 + 2b7b2b3 commit 2bb2f81

File tree

56 files changed

+1531
-244
lines changed

Some content is hidden

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

56 files changed

+1531
-244
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
*.rdb
2-
Language/*.conf*

Configs/Editor/ActionLists/Command/Command.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SCR_EditorActionList {
66
Icon "{2373DD0E0D31AF81}UI/Textures/Editor/Toolbar/Commanding/Toolbar_Commanding_Waypoint_Cycle.edds"
77
}
88
m_ActionGroup COMMAND_WAYPOINT
9-
m_CommandPrefab "{0FBDE34BE96FB7BA}PrefabsEditable/Auto/AI/Waypoints/E_AIWaypointCycle2.et"
9+
m_CommandPrefab "{0FBDE34BE96FB7BA}PrefabsEditable/Auto/AI/Waypoints/E_AIWaypointCycle.et"
1010
}
1111
}
1212
}

Configs/Editor/AttributeLists/Edit.conf

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SCR_EditorAttributeList {
1+
SCR_EditorAttributeList : "{F3D6C6D25642352C}Configs/Editor/AttributeLists/Edit.conf" {
22
m_aAttributes {
33
ODIN_ToggleDamageEditorAttribute "{5964E09573BF5AE9}" {
44
m_UIInfo SCR_EditorAttributeUIInfo "{5964E095742FEEF3}" {
@@ -8,9 +8,10 @@ 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}" {
11+
ODIN_ToggleDamageVehicleEditorAttribute "{5ED6C3A0F21F6245}" {
12+
m_UIInfo SCR_EditorAttributeUIInfo "{5ED6C3A0FE983BF4}" {
1313
Name "#ODIN-Editor_Attribute_EnableDamage_Name"
14+
m_cDescriptionIconColor 0.947 0.056 0.056 1
1415
}
1516
m_CategoryConfig "{7FA3F309CBFCDACF}Configs/Editor/AttributeCategories/Vehicle.conf"
1617
m_Layout "{D0F3CE0C63A5AEBB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Checkbox.layout"

Configs/Editor/PlaceableEntities/Systems/Systems.conf

-6
This file was deleted.
+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
StringTableRuntime {
2+
Ids {
3+
"ODIN-ActionList_TeleportToSquadmate_Description"
4+
"ODIN-ActionList_TeleportToSquadmate_Name"
5+
"ODIN-EditableEntity_AIWaypoint_Cycle_Name"
6+
"ODIN-Editor_Attribute_CompletionRadius_Name"
7+
"ODIN-Editor_Attribute_CompletionRadius_ValueFormating"
8+
"ODIN-Editor_Attribute_CompletionType_All_Name"
9+
"ODIN-Editor_Attribute_CompletionType_Any_Name"
10+
"ODIN-Editor_Attribute_CompletionType_Leader_Name"
11+
"ODIN-Editor_Attribute_CompletionType_Name"
12+
"ODIN-Editor_Attribute_EnableDamage_Name"
13+
"ODIN-Editor_Attribute_Formation_Column_Name"
14+
"ODIN-Editor_Attribute_Formation_Line_Name"
15+
"ODIN-Editor_Attribute_Formation_Name"
16+
"ODIN-Editor_Attribute_Formation_StaggeredColumn_Name"
17+
"ODIN-Editor_Attribute_Formation_Wedge_Name"
18+
"ODIN-Editor_Attribute_Skill_Name"
19+
"ODIN-Editor_Attribute_Stance_Crouch_Name"
20+
"ODIN-Editor_Attribute_Stance_Name"
21+
"ODIN-Editor_Attribute_Stance_Prone_Name"
22+
"ODIN-Editor_Attribute_Stance_Stand_Name"
23+
"ODIN-Editor_Attribute_VisibilityToggle_Name"
24+
"ODIN-Editor_AttributeCategory_Waypoint_Name"
25+
"ODIN-UI_Listbox_OnCancel"
26+
"ODIN-UI_Listbox_OnConfirm"
27+
}
28+
Texts {
29+
"Teleportujte jednotku k jednomu z jejích spolubojovníci"
30+
"Teleportujte se ke spolubojovníci"
31+
"OPAKUJ"
32+
"Poloměr dokončení"
33+
"%1 m"
34+
"Všichni"
35+
"Jakýkoliv"
36+
"Velitel"
37+
"Completion type"
38+
"Povolit poškození"
39+
"Zástup"
40+
"Rojnice"
41+
"Formace"
42+
"Dvojstup"
43+
"Klín"
44+
"Schopnost"
45+
"Zakleknout"
46+
"Postawa"
47+
"Zalehnout"
48+
"Stát"
49+
"Viditelnost"
50+
"Bod trasy"
51+
"Zrušit"
52+
"Potvrdit"
53+
}
54+
}

Configs/Editor/PlaceableEntities/Systems/Systems.conf.meta Language/OdinZeus_localization.cs_cz.conf.meta

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MetaFileClass {
2-
Name "{3A9124B8692C3F39}Configs/Editor/PlaceableEntities/Systems/Systems.conf"
2+
Name "{8EC5FC52087A9C7D}Language/OdinZeus_localization.cs_cz.conf"
33
Configurations {
44
CONFResourceClass PC {
55
}
+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
StringTableRuntime {
2+
Ids {
3+
"ODIN-ActionList_TeleportToSquadmate_Description"
4+
"ODIN-ActionList_TeleportToSquadmate_Name"
5+
"ODIN-EditableEntity_AIWaypoint_Cycle_Name"
6+
"ODIN-Editor_Attribute_CompletionRadius_Name"
7+
"ODIN-Editor_Attribute_CompletionRadius_ValueFormating"
8+
"ODIN-Editor_Attribute_CompletionType_All_Name"
9+
"ODIN-Editor_Attribute_CompletionType_Any_Name"
10+
"ODIN-Editor_Attribute_CompletionType_Leader_Name"
11+
"ODIN-Editor_Attribute_CompletionType_Name"
12+
"ODIN-Editor_Attribute_EnableDamage_Name"
13+
"ODIN-Editor_Attribute_Formation_Column_Name"
14+
"ODIN-Editor_Attribute_Formation_Line_Name"
15+
"ODIN-Editor_Attribute_Formation_Name"
16+
"ODIN-Editor_Attribute_Formation_StaggeredColumn_Name"
17+
"ODIN-Editor_Attribute_Formation_Wedge_Name"
18+
"ODIN-Editor_Attribute_Skill_Name"
19+
"ODIN-Editor_Attribute_Stance_Crouch_Name"
20+
"ODIN-Editor_Attribute_Stance_Name"
21+
"ODIN-Editor_Attribute_Stance_Prone_Name"
22+
"ODIN-Editor_Attribute_Stance_Stand_Name"
23+
"ODIN-Editor_Attribute_VisibilityToggle_Name"
24+
"ODIN-Editor_AttributeCategory_Waypoint_Name"
25+
"ODIN-UI_Listbox_OnCancel"
26+
"ODIN-UI_Listbox_OnConfirm"
27+
}
28+
Texts {
29+
"Teleportiere die Einheit zu einem seiner Kameraden"
30+
"Zum Kameraden teleportieren"
31+
"WIEDERHOLEN"
32+
"Abschlussradius"
33+
"%1 m"
34+
"Alle"
35+
"Irgendeiner"
36+
"Anführer"
37+
"Abschlusstyp"
38+
"Schaden ermöglichen"
39+
"Kolonne"
40+
"Reihe"
41+
"Formation"
42+
"Gestaffelte Kol."
43+
"Keil"
44+
"Fähigkeit"
45+
"Ducken"
46+
"Haltung"
47+
"Hinlegen"
48+
"Aufstehen"
49+
"Sichtbarkeit"
50+
"Wegpunkt"
51+
"Abbrechen"
52+
"Bestätigen"
53+
}
54+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
MetaFileClass {
2+
Name "{5BBBE6611BD98D5D}Language/OdinZeus_localization.de_de.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+
}
+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
StringTableRuntime {
2+
Ids {
3+
"ODIN-ActionList_TeleportToSquadmate_Description"
4+
"ODIN-ActionList_TeleportToSquadmate_Name"
5+
"ODIN-EditableEntity_AIWaypoint_Cycle_Name"
6+
"ODIN-Editor_Attribute_CompletionRadius_Name"
7+
"ODIN-Editor_Attribute_CompletionRadius_ValueFormating"
8+
"ODIN-Editor_Attribute_CompletionType_All_Name"
9+
"ODIN-Editor_Attribute_CompletionType_Any_Name"
10+
"ODIN-Editor_Attribute_CompletionType_Leader_Name"
11+
"ODIN-Editor_Attribute_CompletionType_Name"
12+
"ODIN-Editor_Attribute_EnableDamage_Name"
13+
"ODIN-Editor_Attribute_Formation_Column_Name"
14+
"ODIN-Editor_Attribute_Formation_Line_Name"
15+
"ODIN-Editor_Attribute_Formation_Name"
16+
"ODIN-Editor_Attribute_Formation_StaggeredColumn_Name"
17+
"ODIN-Editor_Attribute_Formation_Wedge_Name"
18+
"ODIN-Editor_Attribute_Skill_Name"
19+
"ODIN-Editor_Attribute_Stance_Crouch_Name"
20+
"ODIN-Editor_Attribute_Stance_Name"
21+
"ODIN-Editor_Attribute_Stance_Prone_Name"
22+
"ODIN-Editor_Attribute_Stance_Stand_Name"
23+
"ODIN-Editor_Attribute_VisibilityToggle_Name"
24+
"ODIN-Editor_AttributeCategory_Waypoint_Name"
25+
"ODIN-UI_Listbox_OnCancel"
26+
"ODIN-UI_Listbox_OnConfirm"
27+
}
28+
Texts {
29+
"Teleport unit to one of its squadmates"
30+
"Teleport To Squadmate"
31+
"CYCLE"
32+
"Completion radius"
33+
"%1 m"
34+
"All"
35+
"Any"
36+
"Leader"
37+
"Completion type"
38+
"Enable damage"
39+
"Column"
40+
"Line"
41+
"Formation"
42+
"Staggered Col."
43+
"Wedge"
44+
"Skill"
45+
"Crouch"
46+
"Stance"
47+
"Prone"
48+
"Stand"
49+
"Visibility"
50+
"Waypoint"
51+
"Cancel"
52+
"Confirm"
53+
}
54+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
MetaFileClass {
2+
Name "{054B6C2A712A885C}Language/OdinZeus_localization.en_us.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+
}
+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
StringTableRuntime {
2+
Ids {
3+
"ODIN-ActionList_TeleportToSquadmate_Description"
4+
"ODIN-ActionList_TeleportToSquadmate_Name"
5+
"ODIN-EditableEntity_AIWaypoint_Cycle_Name"
6+
"ODIN-Editor_Attribute_CompletionRadius_Name"
7+
"ODIN-Editor_Attribute_CompletionRadius_ValueFormating"
8+
"ODIN-Editor_Attribute_CompletionType_All_Name"
9+
"ODIN-Editor_Attribute_CompletionType_Any_Name"
10+
"ODIN-Editor_Attribute_CompletionType_Leader_Name"
11+
"ODIN-Editor_Attribute_CompletionType_Name"
12+
"ODIN-Editor_Attribute_EnableDamage_Name"
13+
"ODIN-Editor_Attribute_Formation_Column_Name"
14+
"ODIN-Editor_Attribute_Formation_Line_Name"
15+
"ODIN-Editor_Attribute_Formation_Name"
16+
"ODIN-Editor_Attribute_Formation_StaggeredColumn_Name"
17+
"ODIN-Editor_Attribute_Formation_Wedge_Name"
18+
"ODIN-Editor_Attribute_Skill_Name"
19+
"ODIN-Editor_Attribute_Stance_Crouch_Name"
20+
"ODIN-Editor_Attribute_Stance_Name"
21+
"ODIN-Editor_Attribute_Stance_Prone_Name"
22+
"ODIN-Editor_Attribute_Stance_Stand_Name"
23+
"ODIN-Editor_Attribute_VisibilityToggle_Name"
24+
"ODIN-Editor_AttributeCategory_Waypoint_Name"
25+
"ODIN-UI_Listbox_OnCancel"
26+
"ODIN-UI_Listbox_OnConfirm"
27+
}
28+
Texts {
29+
"Unidad de teletransporte a uno de sus compañeros de escuadrón"
30+
"Teletransportarse a compañero de escuadrón"
31+
"CICLO"
32+
"Radio de consecución"
33+
"%1 m"
34+
"Todo"
35+
"Cualquiera"
36+
"Líder"
37+
"Completion type"
38+
"Activar daño"
39+
"Columna"
40+
"Línea"
41+
"Formación"
42+
"Col. escalonada"
43+
"Cuña"
44+
"Habilidad"
45+
"Agachado"
46+
"Postura"
47+
"Tumbado"
48+
"De pie"
49+
"Visibilidad"
50+
"unto de referencia"
51+
"Cancelar"
52+
"Confirmar"
53+
}
54+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
MetaFileClass {
2+
Name "{C00721A39F28E343}Language/OdinZeus_localization.es_es.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+
}
+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
StringTableRuntime {
2+
Ids {
3+
"ODIN-ActionList_TeleportToSquadmate_Description"
4+
"ODIN-ActionList_TeleportToSquadmate_Name"
5+
"ODIN-EditableEntity_AIWaypoint_Cycle_Name"
6+
"ODIN-Editor_Attribute_CompletionRadius_Name"
7+
"ODIN-Editor_Attribute_CompletionRadius_ValueFormating"
8+
"ODIN-Editor_Attribute_CompletionType_All_Name"
9+
"ODIN-Editor_Attribute_CompletionType_Any_Name"
10+
"ODIN-Editor_Attribute_CompletionType_Leader_Name"
11+
"ODIN-Editor_Attribute_CompletionType_Name"
12+
"ODIN-Editor_Attribute_EnableDamage_Name"
13+
"ODIN-Editor_Attribute_Formation_Column_Name"
14+
"ODIN-Editor_Attribute_Formation_Line_Name"
15+
"ODIN-Editor_Attribute_Formation_Name"
16+
"ODIN-Editor_Attribute_Formation_StaggeredColumn_Name"
17+
"ODIN-Editor_Attribute_Formation_Wedge_Name"
18+
"ODIN-Editor_Attribute_Skill_Name"
19+
"ODIN-Editor_Attribute_Stance_Crouch_Name"
20+
"ODIN-Editor_Attribute_Stance_Name"
21+
"ODIN-Editor_Attribute_Stance_Prone_Name"
22+
"ODIN-Editor_Attribute_Stance_Stand_Name"
23+
"ODIN-Editor_Attribute_VisibilityToggle_Name"
24+
"ODIN-Editor_AttributeCategory_Waypoint_Name"
25+
"ODIN-UI_Listbox_OnCancel"
26+
"ODIN-UI_Listbox_OnConfirm"
27+
}
28+
Texts {
29+
"Téléporter l'unité à l'un de ses coéquipiers"
30+
"Téléportation vers un coéquipier"
31+
"RÉITÉRER"
32+
"Radio de consecución"
33+
"%1 m"
34+
"Tous"
35+
"Quelconque"
36+
"Chef"
37+
"Type de consecución"
38+
"Activer dégâts"
39+
"Colonne"
40+
"Ligne"
41+
"Formation"
42+
"Col. décalée"
43+
"Coin"
44+
"Compétence"
45+
"Accroupi"
46+
"Position"
47+
"À plat ventre"
48+
"Debout"
49+
"Visibilité"
50+
"Point de passage"
51+
"Annuler"
52+
"Confirmer"
53+
}
54+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
MetaFileClass {
2+
Name "{7BAFD49479AB0041}Language/OdinZeus_localization.fr_fr.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+
}

0 commit comments

Comments
 (0)