W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch

Browse Source
This commit is contained in:
A Man
2020-04-17 17:58:06 +02:00
parent b7ebb3c3f0 6cab237e23
commit ef1f22f00d
4 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Documents/Epoch 1.0.6.2 Classnames/Epoch 1.0.6.2 CfgVehicles.txt
View File

@@ -29,6 +29,7 @@ AH6X_DZ
AH6X_EP1
AN2_2_DZ
AN2_DZ
ATV_CIV_CP
ATV_CZ_EP1
ATV_US_EP1
AV8B
@@ -70,9 +71,11 @@ BAF_Merlin_DZE
BAF_Merlin_HC3_D
BAF_Offroad_D
BAF_Offroad_W
BMP2_ACR
BMP2_Ambul_CDF
BMP2_Ambul_INS
BMP2_CDF
BMP2_Des_ACR
BMP2_Gue
BMP2_HQ_CDF
BMP2_HQ_INS
@@ -81,10 +84,12 @@ BMP2_INS
BMP2_TK_EP1
BMP2_UN_EP1
BMP3
BRDM2_ACR
BRDM2_ATGM_CDF
BRDM2_ATGM_INS
BRDM2_ATGM_TK_EP1
BRDM2_CDF
BRDM2_Desert_ACR
BRDM2_Gue
BRDM2_HQ_Gue
BRDM2_HQ_TK_GUE_EP1
@@ -103,6 +108,8 @@ BTR90_DZE
BTR90_HQ
BTR90_HQ_DZ
BTR90_HQ_DZE
BVP1_TK_ACR
BVP1_TK_GUE_ACR
C130J
C130J_US_EP1
C130J_US_EP1_DZ
@@ -133,6 +140,13 @@ DSHkM_Mini_TriPod
DSHkM_Mini_TriPod_CDF
DSHkM_Mini_TriPod_TK_GUE_EP1
DSHkM_Mini_TriPod_TK_INS_EP1
Dingo_DST_ACR
Dingo_GL_DST_ACR
Dingo_GL_Wdl_ACR
Dingo_WDL_ACR
EOffroad_DSHKM_TERROR
EOffroad_SPG9_TERROR
EPickup_PK_TERROR
F35B
Fishing_Boat
Fort_Nest_M240
@@ -176,15 +190,18 @@ HMMWV_M1151_M2_CZ_DES_EP1_DZE
HMMWV_M1151_M2_DES_EP1
HMMWV_M2
HMMWV_M2_DZ
HMMWV_M2_USArmy
HMMWV_M998A2_SOV_DES_EP1
HMMWV_M998A2_SOV_DES_EP1_DZ
HMMWV_M998A2_SOV_DES_EP1_DZE
HMMWV_M998_crows_M2_DES_EP1
HMMWV_M998_crows_MK19_DES_EP1
HMMWV_MK19
HMMWV_MK19_DES_EP1
HMMWV_Mk19
HMMWV_Mk19_USArmy
HMMWV_TOW
HMMWV_TOW_DES_EP1
HMMWV_TOW_USArmy
HMMWV_Terminal_EP1
Igla_AA_pod_East
Igla_AA_pod_TK_EP1
@@ -227,6 +244,9 @@ Kamaz_DZE1
Kamaz_DZE2
Kamaz_DZE3
Kamaz_DZE4
L159_ACR
L39_2_ACR
L39_ACR
L39_TK_EP1
LAV25
LAV25_DZ
@@ -259,6 +279,9 @@ LadaLM_DZE1
LadaLM_DZE2
LadaLM_DZE3
LadaLM_DZE4
LandRover_ACR
LandRover_Ambulance_ACR
LandRover_Ambulance_Des_ACR
LandRover_CZ_EP1
LandRover_MG_TK_EP1
LandRover_MG_TK_EP1_DZ
@@ -272,6 +295,8 @@ LandRover_Special_CZ_EP1_DZE
LandRover_TK_CIV_EP1
M1030
M1030_US_DES_EP1
M1114_AGS_ACR
M1114_DSK_ACR
M1126_ICV_M2_EP1
M1126_ICV_mk19_EP1
M1128_MGS_EP1
@@ -351,6 +376,7 @@ Mi17_medevac_RU
Mi17_medevac_RU_DZ
Mi17_rockets_RU
Mi24_D
Mi24_D_CZ_ACR
Mi24_D_TK_EP1
Mi24_P
Mi24_V
@@ -364,6 +390,7 @@ MtvrRepair
MtvrRepair_DES_EP1
MtvrSalvage_DES_EP1
MtvrSupply_DES_EP1
Octavia_ACR
Offroad_DSHKM_Gue
Offroad_DSHKM_Gue_DZ
Offroad_DSHKM_Gue_DZE
@@ -372,14 +399,19 @@ Offroad_DSHKM_Gue_DZE2
Offroad_DSHKM_Gue_DZE3
Offroad_DSHKM_Gue_DZE4
Offroad_DSHKM_INS
Offroad_DSHKM_TERROR
Offroad_DSHKM_TK_GUE_EP1
Offroad_SPG9_Gue
Offroad_SPG9_TERROR
Offroad_SPG9_TK_GUE_EP1
Old_bike_TK_CIV_EP1
Old_bike_TK_INS_EP1
Old_moto_TK_Civ_EP1
PBX
PBX_ACR
Pandur2_ACR
Pchela1T
Pchela1T_CDF
Pickup_PK_GUE
Pickup_PK_GUE_DZ
Pickup_PK_GUE_DZE
@@ -394,6 +426,7 @@ Pickup_PK_INS_DZE1
Pickup_PK_INS_DZE2
Pickup_PK_INS_DZE3
Pickup_PK_INS_DZE4
Pickup_PK_TERROR
Pickup_PK_TK_GUE_EP1
Pickup_PK_TK_GUE_EP1_DZ
Pickup_PK_TK_GUE_EP1_DZE
@@ -404,7 +437,9 @@ Pickup_PK_TK_GUE_EP1_DZE4
RHIB
RHIB2Turret
RHIB_DZ
RM70_ACR
RU_WarfareBMGNest_PK
Rbs70_ACR
S1203_TK_CIV_EP1
S1203_ambulance_EP1
SPG9_CDF
@@ -517,11 +552,24 @@ T34_TK_EP1
T34_TK_GUE_EP1
T55_TK_EP1
T55_TK_GUE_EP1
T72_ACR
T72_CDF
T72_Gue
T72_INS
T72_RU
T72_TK_EP1
T810A_Des_MG_ACR
T810A_MG_ACR
T810Reammo_ACR
T810Reammo_Des_ACR
T810Refuel_ACR
T810Refuel_Des_ACR
T810Repair_ACR
T810Repair_Des_ACR
T810_ACR
T810_Des_ACR
T810_Open_ACR
T810_Open_Des_ACR
T90
TOW_TriPod
TOW_TriPod_US_EP1
@@ -557,6 +605,7 @@ UAZ_RU_DZE2
UAZ_RU_DZE3
UAZ_RU_DZE4
UAZ_SPG9_INS
UAZ_Unarmed_ACR
UAZ_Unarmed_TK_CIV_EP1
UAZ_Unarmed_TK_CIV_EP1_DZE1
UAZ_Unarmed_TK_CIV_EP1_DZE2

2
SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp
View File

@@ -218,7 +218,7 @@ class MK14_SD_DZ: M14_EP1
class MK14_CCO_SD_DZ: MK14_SD_DZ
{
displayName = $TR_DZ_WPN_MK14_CCO_SD_NAME;
displayName = $STR_DZ_WPN_MK14_CCO_SD_NAME;
model = "\RH_mgswp\RH_mk14sdaim.p3d";
picture = "\RH_mgswp\inv\mk14sdaim.paa";
handAnim[] = {"OFP2_ManSkeleton","\RH_mgswp\anim\RH_M4cs.rtm"};

2
SQF/dayz_code/Configs/CfgWeapons/Rifles/XM2010.hpp
View File

@@ -125,7 +125,7 @@ class XM2010_SD_DZ: XM2010_SD_BASE
class XM2010_NV_DZ: XM2010_BASE
{
scope = public;
displayName = $TR_DZ_WPN_XM2010_NV_NAME;
displayName = $STR_DZ_WPN_XM2010_NV_NAME;
descriptionShort = $STR_DZ_WPN_XM2010_NV_DESC;
model = "\fhq_remington\XM2010\XM2010_nv.p3d";
picture = "\fhq_remington\XM2010\icons\xm2010_nv.paa";

2
SQF/mod.cpp
View File

@@ -1,5 +1,5 @@
dir = "@DayZ_Epoch";
name = "DayZ Epoch 1.0.6.2";
name = "DayZ Epoch 1.0.7";
picture = "z\addons\dayz_code\gui\loadingscreen.paa";
actionName = "Website";
action = "http://www.dayzepoch.com";