From 792e2d90bf38562fbbb6edd67c1e19c7673ee3bb Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 12 Jul 2016 15:17:22 -0500 Subject: [PATCH] 0.3.9 b570 --- .../@epochhive/addons/epoch_server.pbo | Bin 438982 -> 438982 bytes .../@epochhive/addons/epoch_server_core.pbo | Bin 21149 -> 21149 bytes .../addons/epoch_server_settings.pbo | Bin 451335 -> 451335 bytes .../mpmissions/epoch.Altis.pbo | Bin 1338460 -> 1338542 bytes .../mpmissions/epoch.Australia.pbo | Bin 1336696 -> 1336778 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 1337789 -> 1337871 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 1337628 -> 1337710 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 1337604 -> 1337686 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 1337625 -> 1337707 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 1337754 -> 1337836 bytes .../mpmissions/epoch.Esseker.pbo | Bin 1337592 -> 1337674 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 1338031 -> 1338113 bytes Server_Install_Pack/mpmissions/epoch.Napf.pbo | Bin 1338425 -> 1338507 bytes .../mpmissions/epoch.Porto.pbo | Bin 1337739 -> 1337821 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 1337776 -> 1337858 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 1338010 -> 1338092 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 1338020 -> 1338102 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 1338025 -> 1338107 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 1337752 -> 1337834 bytes .../mpmissions/epoch.Stratis.pbo | Bin 1337600 -> 1337682 bytes .../mpmissions/epoch.Takistan.pbo | Bin 1337710 -> 1337792 bytes .../mpmissions/epoch.Tanoa.pbo | Bin 1338232 -> 1338314 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 1337582 -> 1337664 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 1338029 -> 1338111 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 1337678 -> 1337760 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 1337733 -> 1337815 bytes .../functions/EPOCH_fnc_playerDeath.sqf | 1 + .../epoch_config/Configs/CfgEpochClient.hpp | 2 +- Sources/epoch_config/build.hpp | 2 +- Sources/epoch_server/build.hpp | 2 +- Sources/epoch_server_core/build.hpp | 2 +- Sources/epoch_server_settings/build.hpp | 2 +- build.txt | 2 +- 33 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index 104a778a1a165e9cfc8c556118558f47b8cfc5f8..2b5a6c485e079db63b4635223875c0b3a8c5e8c9 100644 GIT binary patch delta 123 zcmX^1RO;AMsR-{Er$*?KAw}$gGOx$amykDw)zZ4@7GXXI(5VHU=>-POpY@er#Oft^1 WaXe!3g!%i@IggnXe>vTKGz9=Ai7h2T0WZ0~oTEqDnChj%bIB%yoP;7Ig#9~G!Yp2QoB!eYPj4Vx+ zta-U=f%yII{Yj;nIVrZLW){;gK4J`O-Y?a@Uy2cknShuXh*^M`b^CrPw$IZ=o+t@2 WMm~Q#>7&km&BwpJUew0~9|8c(DliWK diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo index f92d5995218559c962103b15ecdb2eb7a665296f..9a70c3b513c8c1869e2844cec9060d4cd3ea08a1 100644 GIT binary patch delta 90 zcmbQclyUA-#tFVm8~rBw%P?uUZ_GW+1msLMVvYs!CQoDzmM}9iGF7tX<*EhZ_q+Ee sm1gFo*qWMIPIgp{*c`%Q>L1+DZ5vX(x0Atl5XaE2J delta 90 zcmbQclyUA-#tFVmTJ975Wti-oHs&5?0&*rBF~D^%F69lk)%OE5D+9j_MCfbxWo!c&hyx03yvGyZ`_I diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo index bc443de6a9205d0369cfd40f68c0398a8feda082..5cd94d839825394ed693b950460cd7e98aa0694b 100644 GIT binary patch delta 133 zcmZoaCf$BadP1PW7QfbT7X}7~q|(fs6upds0w5a!wA?2a$}(;7+c@DP87P%|-+?b`~ TN5|(W;ey9*EncMcfo&52pI|Ns delta 133 zcmZoaCf$BadP1Orj(cmk3j+f~QfX#Rie5%R0g#OV4o(vbWtnu`H%|D-#^m5MxtTp! z!o=9XK*^eys}_jg@7@pAXlrU_(fp3R{T(|a5HkTWGZ3=?G3)ks>};&JMVx==i)}c* TO6R_WpPkbIu|K;np7sR*Bxo#2 diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 502906c9d34d6fec4cecbb5ac8803431b75e5734..4c613692b38ce0c306e0811287c2b7846bbd07c0 100644 GIT binary patch delta 307 zcmca}BXHf#zzJqdJN!0U2nn#Y`L%}IaZgrc6rFs5Ph_&50QYp6Tqd5)69m5Nux$ZK z@-s}{=peOuxor&-n;(#WNEgUg+wAWk!o{TLJ~`DZmc`7-*s%GSSNkz9#_h+vm?Wiq z^z{`|G85C|bMn&_((;RP6H64Lm0Vn%Lfx$tTm$@_J>m;;5-U@S9CI?uQbRIxQx#MV zm2|Mm#J1l_VFF@iAZ7t#Rv=~rVs;?r*nTI4lkp^zxxw^+Iu@7d2aH)2rmr*O;%WES z;{sxCAO^8{ftU}7`M3M)2{5xW`)1~~2bl^0u^Q5Stf>`GA;z`#e1XX7=_arUF1L2*g4_EWCY*smM1okqKRmL3&Ybn{Mba Ow(9*_9)4{9-sJ$;wo!5b diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index 4fee907f214aac040879a1c328620ead748b1791..24436ad669b07b8caae62b4ce68a1e4ec983c2ca 100644 GIT binary patch delta 307 zcmexyD)7|lzzJqdyZts=2nn#Y`L%}IaZgrc6rFs5Ph_&50QYp6Tqd5)69m5Num;;5-U@S9CI?uQbRIxQx#MV zm2|Mm#J1l_VFF@iAZ7t#Rv=~rVs;?r*nTI4lkp^zxxw^+Iu@7d2aH)2rmr*O;%WES z;{sxCAO^8{ftU}7`M3M)2{5xW`)1~~2bl^0u^Q5Stf>`GA;z`#e1XX7=_arUF1L2*g4_EWCY*sfdt)$f^??o=;y}HGN}8 PlkxpkPDeacnvVhi3BghQ diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index def7f5f5d7c10d6d412ed91c6a44c5bd673e2f34..dca5c180fc4a86507e7e99f4eebfe253e51f2880 100644 GIT binary patch delta 307 zcmdmcIk5jq-~=wqzmM$ZT5E%;bO9IpPcFy%VK6^V$gidtNoZ4Gj$#{~<++cb@9gEBK1IDZh)7P1C@wEHv zaRD(m5QEsfK+Ffk{M-HY1en>GeKYgggG>d0SP+PXfLM5Ykf}(xiHKwJl!anB+6R6g PS#sd#sjbf5##6ZgtGjBQ delta 232 zcmeCb61ewr-~=-!EBB2SLIP}u-CD!nb4^xc6rFs5Ph_&50QdClTqd5)69m5Nu$jBJ zhVwH_-sm7Tz0yTkaq|h=XePE`j@Iz~x<1nSq!Eh*^P{4T#x+m}9$MD(Alw%x0F>(;FwUI8PVwXH}T~*Nls& zeV!f{5OV`Dh|LScd_c^m;;5-U@S9CI?uQbRIxQx#MV zm2|Mm#J1l_VFF@iAZ7t#Rv=~rVs;?r*nTI4lkp^zxxw^+Iu@7d2aH)2rmr*O;%WES z;{sxCAO^8{ftU}7`M3M)2{5xW`)1~~2bl^0u^ z4d-W=ywO2wdZml7;^q^!(M)W?9IfH|b%BCvoBbU`xR`>RCZ~GEvX~efS~ef^YCq=1 zxc!(HlcZF;UMdq1GXpUT5VHa?8xXStF~@ejRL*}Vn9VG$r#DVyah@*V&#Ex}uNfCl z`#e1^Am#>Q5Stf>`GA;z`#e1XX7=_arUF1L2*g4_EWCY*smL~Ck>F0xdw0$p;kIjE ODZbK-Yd80onbQF9BT(A_ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index f9c47af017f5a875dd0a16a5154b374dc9032aae..89a723ee5ae418261e0299f225b73f6b926816fa 100644 GIT binary patch delta 307 zcmZp<6nO1Y-~=wqzmM$ZT5E%;bL-hpPcFy%VK6^V%dDmtNoZ4Gj$#{~<++cb@9gEBK1IDZh)7P1C@wEHv zaRD(m5QEsfK+Ffk{M-HY1en>GeKYgggG>d0SP+PXfLM5Ykg3Q#W09>ddvEyJZ#Dh< QX_c|!1g>uJdy6Lm0PeJFh5!Hn delta 232 zcmcb1DX`^I-~=-!7x#@8LIP}u-CD!nb4^xc6rFs5Ph_&50QdClTqd5)69m5NusOQ7 zhVwH_-sm7Tz0yTkaq|h=XePE`j@Iz~x<1nSq!Eh*^P{4T#x+m}9$MD(Alw%x0F>(;FwUI8PVwXH}T~*Nls& zeV!f{5OV`Dh|LScd_c^-n*j9tJ_c>@5otWIYD diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index 185b4b9214f72824b2c159d1e46274b21eae043b..e73db4d665cd3d244eb653df2e542f8d85d1f4d4 100644 GIT binary patch delta 307 zcmbPvDe(2BzzJqd=lnKW2nn#Y`L%}IaZgrc6rFs5Ph_&50QYp6Tqd5)69m5Nu$=}< z@-s}{=peOuxor&-n;(#WNEgUg+wAWk!o}p~J~`DZmc`7-)TH^CSNkz9#_h+vm?Wiq z^z{`|G85C|bMn&_((;RP6H64Lm0Vn%Lfx$tTm$@_J>m;;5-U@S9CI?uQbRIxQx#MV zm2|Mm#J1l_VFF@iAZ7t#Rv=~rVs;?r*nTI4lkp^zxxw^+Iu@7d2aH)2rmr*O;%WES z;{sxCAO^8{ftU}7`M3M)2{5xW`)1~~2bl^0u^fn%5 P&uK8=u+=V8JpBv+2#ILh delta 232 zcmaETDRAbczzJqdp6(khgap_QyS0YD=bEg@C_4E9pU7lA0q*J9xlBBpCkTAkVRLhD z4d-W=ywO2wdZml7;^q^!(M)W?9IfH|b%BCvoBbU`xR_#`CZ~GEvX~efSvDW@YCq=1 zxc!(HlcZF;UMdq1GXpUT5VHa?8xXStF~@ejRL*}Vn9VG$r#DVyah@*V&#Ex}uNfCl z`#e1^Am#>Q5Stf>`GA;z`#e1XX7=_arUF1L2*g4_EWCY*smNwy5pMm))iKkQE7M+C OL|?1QkDs;SRxAMUYfzQ| diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index c2d97fe5376aba6d2b8936eeb3dbc9d69f76e24c..bddb0a13b8476daf5229b9c5f85207cfac6664e6 100644 GIT binary patch delta 307 zcmbPrIq=QpzzJqdm;E+c2nn#Y`L%}IaZgrc6rFs5Ph_&50QYp6Tqd5)69m5Nuw4L3 z@-s}{=peOuxor&-n;(#WNEgUg+wAWk!o}q6J~`DZmc`7-)Ux@QSNkz9#_h+vm?Wiq z^z{`|G85C|bMn&_((;RP6H64Lm0Vn%Lfx$tTm$@_J>m;;5-U@S9CI?uQbRIxQx#MV zm2|Mm#J1l_VFF@iAZ7t#Rv=~rVs;?r*nTI4lkp^zxxw^+Iu@7d2aH)2rmr*O;%WES z;{sxCAO^8{ftU}7`M3M)2{5xW`)1~~2bl^0u^Zu?7HWP~z50a!N3m=0 delta 232 zcmaEJIdInHzzJqde(oDBgap_QyS0YD=bEg@C_4E9pU7lA0q*J9xlBBpCkTAkVe@ux z4d-W=ywO2wdZml7;^q^!(M)W?9IfH|b%BCvoBbU`xR?^1CZ~GEvX~efn=~KuYCq=1 zxc!(HlcZF;UMdq1GXpUT5VHa?8xXStF~@ejRL*}Vn9VG$r#DVyah@*V&#Ex}uNfCl z`#e1^Am#>Q5Stf>`GA;z`#e1XX7=_arUF1L2*g4_EWCY*sfdY*$j++d`(2y!89#oR O+fnuV?crc diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index 122ad095b7cda27167fc690c4529e69efa404e73..a7fb6c907413c8fdb25835a1422a7f4654c7182d 100644 GIT binary patch delta 307 zcmexyG4Rx-zzJqd*ZnqH2nn#Y`L%}IaZgrc6rFs5Ph_&50QYp6Tqd5)69m5Nuw4a8 z@-s}{=peOuxor&-n;(#WNEgUg+wAWk!o?KeJ~`DZmc`7-%((fOSNkz9#_h+vm?Wiq z^z{`|G85C|bMn&_((;RP6H64Lm0Vn%Lfx$tTm$@_J>m;;5-U@S9CI?uQbRIxQx#MV zm2|Mm#J1l_VFF@iAZ7t#Rv=~rVs;?r*nTI4lkp^zxxw^+Iu@7d2aH)2rmr*O;%WES z;{sxCAO^8{ftU}7`M3M)2{5xW`)1~~2bl^0u^p?~9zd Pu4rRKW;#RE+mfjOg->fu delta 232 zcmX?gDe%X|zzJqd!R{L^gap_QyS0YD=bEg@C_4E9pU7lA0q*J9xlBBpCkTAkVGD3? z4d-W=ywO2wdZml7;^q^!(M)W?9IfH|b%BCvoBbU`xR}zMCZ~GEvX~efTQ(o_YCq=1 zxc!(HlcZF;UMdq1GXpUT5VHa?8xXStF~@ejRL*}Vn9VG$r#DVyah@*V&#Ex}uNfCl z`#e1^Am#>Q5Stf>`GA;z`#e1XX7=_arUF1L2*g4_EWCY*smLT_5u4OSH~G}9%e=)8 OFXi5wqzmM$ZT5E%;bIDPpPcFy%VK6^X3>1itNoZ4Gj$#{~<++cb@9gEBK1IDZh)7P1C@wEHv zaRD(m5QEsfK+Ffk{M-HY1en>GeKYgggG>d0SP+PXfLM5Ykg15LsR(0u?ujEo?pu$# Pe3wfWj`r90tvm_<+-hko delta 232 zcmZp?7P$Uu-~=nwIB0h z+<1nSq!Eh*^P{4T#x+m}9$MD(Alw%x0F>(;FwUI8PVwXH}T~*Nls& zeV!f{5OV`Dh|LScd_c^wqzmM$ZT5E%;bMw(pPcFy%VK6^Zrps#tNoZ4Gj$#{~<++cb@9gEBK1IDZh)7P1C@wEHv zaRD(m5QEsfK+Ffk{M-HY1en>GeKYgggG>d0SP+PXfLM5Ykg3RJGZF8tfx6SWrYih- P#QZ&Z%WiA8s!hoNA69Eo delta 232 zcmeCa8MyOC-~=<1nSq!Eh*^P{4T#x+m}9$MD(Alw%x0F>(;FwUI8PVwXH}T~*Nls& zeV!f{5OV`Dh|LScd_c^wqzmM$ZT5E%;bMw&pPcFy%VK6^Zr*&%tNoZ4Gj$#{~<++cb@9gEBK1IDZh)7P1C@wEHv zaRD(m5QEsfK+Ffk{M-HY1en>GeKYgggG>d0SP+PXfLM5Ykg15OiAcDQvSs}5X(?%0 PZeD+P&D?oXY2Qi!G$U%w delta 232 zcmcb6Ik5Y3-~=<1nSq!Eh*^P{4T#x+m}9$MD(Alw%x0F>(;FwUI8PVwXH}T~*Nls& zeV!f{5OV`Dh|LScd_c^wqzmM$ZT5E%;bKa5pPcFy%VK6^VbpxgtNoZ4Gj$#{~<++cb@9gEBK1IDZh)7P1C@wEHv zaRD(m5QEsfK+Ffk{M-HY1en>GeKYgggG>d0SP+PXfLM5Ykg155iHPf}{Osx#(d%Xy Pa5!(07hP|pa_j>D0Oe_7 delta 232 zcmZp=61d@V-~=ClT*E7Sxk&g&6|&TwIB0h z+<1nSq!Eh*^P{4T#x+m}9$MD(Alw%x0F>(;FwUI8PVwXH}T~*Nls& zeV!f{5OV`Dh|LScd_c^VzzJqd@BKDf2nn#Y`L%}IaZgrc6rFs5Ph_&50QYp6Tqd5)69m5Nu)P6F z@-s}{=peOuxor&-n;(#WNEgUg+wAWk!o`&CJ~`DZmc`7-!o2yISNkz9#_h+vm?Wiq z^z{`|G85C|bMn&_((;RP6H64Lm0Vn%Lfx$tTm$@_J>m;;5-U@S9CI?uQbRIxQx#MV zm2|Mm#J1l_VFF@iAZ7t#Rv=~rVs;?r*nTI4lkp^zxxw^+Iu@7d2aH)2rmr*O;%WES z;{sxCAO^8{ftU}7`M3M)2{5xW`)1~~2bl^0u^Q5Stf>`GA;z`#e1XX7=_arUF1L2*g4_EWCY*sfdZGNL;M?N9%=W6mH+l Ollv)NdrtY#v1kB7OHoGv diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index e4edc66862357edb270d740323306a8fbd5c0f15..7ec9178740e8745c9b6fe1b23210e479fd738883 100644 GIT binary patch delta 307 zcmZ2-HSpWjzzJqdpZzvk2nn#Y`L%}IaZgrc6rFs5Ph_&50QYp6Tqd5)69m5NuzdhZ z@-s}{=peOuxor&-n;(#WNEgUg+wAWk!o`&1J~`DZmc`7-(y;lMSNkz9#_h+vm?Wiq z^z{`|G85C|bMn&_((;RP6H64Lm0Vn%Lfx$tTm$@_J>m;;5-U@S9CI?uQbRIxQx#MV zm2|Mm#J1l_VFF@iAZ7t#Rv=~rVs;?r*nTI4lkp^zxxw^+Iu@7d2aH)2rmr*O;%WES z;{sxCAO^8{ftU}7`M3M)2{5xW`)1~~2bl^0u^Q5Stf>`GA;z`#e1XX7=_arUF1L2*g4_EWCY*sfeAah}P`FLNyL|@lV@a OzW>}6cCBt=aufhom;;5-U@S9CI?uQbRIxQx#MV zm2|Mm#J1l_VFF@iAZ7t#Rv=~rVs;?r*nTI4lkp^zxxw^+Iu@7d2aH)2rmr*O;%WES z;{sxCAO^8{ftU}7`M3M)2{5xW`)1~~2bl^0u^Q5Stf>`GA;z`#e1XX7=_arUF1L2*g4_EWCY*sfe?wh=kOF5UsSWXNB*2 OPnfvp#7Vbl<@W()NKs}0 diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index 46b2241cc2e9941ccded820130c602c78d0fbe3a..07ac7195ed774457f856648e738cea380bc83573 100644 GIT binary patch delta 307 zcmbPnIq=oxzzJqdfBZID2nn#Y`L%}IaZgrc6rFs5Ph_&50QYp6Tqd5)69m5Nu>Ar` z@-s}{=peOuxor&-n;(#WNEgUg+wAWk!o^hTJ~`DZmc`82z@Yhm;;5-U@S9CI?uQbRIxQx#MV zm2|Mm#J1l_VFF@iAZ7t#Rv=~rVs;?r*nTI4lkp^zxxw^+Iu@7d2aH)2rmr*O;%WES z;{sxCAO^8{ftU}7`M3M)2{5xW`)1~~2bl^0u^y+ZUY&PkjfD*Wn{{fz delta 232 zcmaELIdI11zzJqd7491?gap_QyS0YD=bEg@C_4E9pU7lA0q*J9xlBBpCkTAkVJmfS z4d-W=ywO2wdZml7;^q^!(M)W?9IfH|b%BCvoBbU`xR|<~CZ~GEvX~f~n>8QvYCq=1 zxc!(HlcZF;UMdq1GXpUT5VHa?8xXStF~@ejRL*}Vn9VG$r#DVyah@*V&#Ex}uNfCl z`#e1^Am#>Q5Stf>`GA;z`#e1XX7=_arUF1L2*g4_EWCY*sfdw@h>6Y72DRQh>~}+o O*IzhLweRfeGsgj3uTr1@ diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index ee80834b4723f69e07dc2e13336cd93038f24e0c..5e018834285ccaea75f74a5015d8c7181c177053 100644 GIT binary patch delta 307 zcmZp;6nN=U-~=-!M*oc#LIP}Uey!nl+>;dHv2n>a4}W6PfqoUWic~0Fl|2O)qc#2ar-eZCP^tD zeSL+L%*6Egocwf!wEUvn#1e&QB^OtxPq~Yw%TpA0b^E$>Fdn6c-sB- zxPX`&h(T;#Am#&N{_XyH0?h2pzL|OLL8bygEC|FxKrFmH$W&yOv4}`V_z$;5rB(5F P8*{YJv+v846>kRsOKWL0 delta 232 zcmca~DX`&E-~=Q5Stf>`GA;z`#e1XX7=_arUF1L2*g4_EWCY*smLs2kwx}Xx&eA;ueRCWL4=E`-hFbaS1gN}v7tfpF|YPxUX0t1c`->! z`RMB_q+}+h$LHjyE2QNYKf2E^<@%(4AW3Mb=9CUb-70d*`c(+?Q4DokHz#>La_ zug3+%+&~Os^8zs+5c6;M*Arl7XZFp^YY#FN0AfKP76M}7?Lnp@93~>&XIhsx*T+At QdB;~aF)D%gm^Axe0L7PSGXMYp delta 232 zcmX?bIq==3zzJqdjqV#Qgap_QyS0YD=bEg@C_4E9pU7lA0q*J9xlBBpCkTAkVXJd* z4d-W=ywO2wdZml7;^q^!(M)W?9IfH|b%BCvoBbU`xR|CoO-}WSWic_fFl|2O)qc#2 zar-eZCP}Gwy;LS3W(HywAZ7((HXvpPVvg;4shs~#Fq>IgPj8&a;yhizpH*S{Uo$SA z_IY|-K+FxqAT}=$^8qpc_IY{&%cv^gap{y{9429xF;(zicY@3Co)-2fP1=3E)&n@2?F1B*f{)K z!}%E|Z*-8_yxg{iiOmnF_>eA;ueRCWL4=E`*?n@VS1gN}v7t%xF|YPxUX0t1c`->! z`RMB_q+}+h$LHjyE2QNYKf2E^<@%(4AW3Mb=9CUb-70d*`c(+?Q4DokHz#>La_ zug3+%+&~Os^8zs+5c6;M*Arl7XZFp^YY#FN0AfKP76M}7?Lnp@LS`bhi?lh)^u4S< QGWd0Tx+uKevqe?|0NF=pS^xk5 delta 232 zcmX?gJ@Ci1zzJqdZSET_gap_QyS0YD=bEg@C_4E9pU7lA0q*J9xlBBpCkTAkVQY48 z4d-W=ywO2wdZml7;^q^!(M)W?9IfH|b%BCvoBbU`xR_=-O-}WSWic_fG-y8N)qc#2 zar-eZCP}Gwy;LS3W(HywAZ7((HXvpPVvg;4shs~#Fq>IgPj8&a;yhizpH*S{Uo$SA z_IY|-K+FxqAT}=$^8qpc_IY{&%eA;ueRCWL4=E`$9;0DS1gN}v5|4}F|YPxUX0t1c`->! z`RMB_q+}+h$LHjyE2QNYKf2E^<@%(4AW3Mb=9CUb-70d*`c(+?Q4DokHz#>La_ zug3+%+&~Os^8zs+5c6;M*Arl7XZFp^YY#FN0AfKP76M}7?Lnp@9mXPiJ+HQY+5ci< Q_azqPx_~d4zFIuH00n|-U;qFB delta 232 zcmX?bDe&FJzzJqd{q7qrgap_QyS0YD=bEg@C_4E9pU7lA0q*J9xlBBpCkTAkVe4^k z4d-W=ywO2wdZml7;^q^!(M)W?9IfH|b%BCvoBbU`xR@3@O-}WSWic_fv}``+)qc#2 zar-eZCP}Gwy;LS3W(HywAZ7((HXvpPVvg;4shs~#Fq>IgPj8&a;yhizpH*S{Uo$SA z_IY|-K+FxqAT}=$^8qpc_IY{&%TI`snGzo*HKsi diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index 55aa4b886d0256d54f794274a45a6aea5d9a1652..84ecd7da522290e8adc1e7ca53a30228f9b85667 100644 GIT binary patch delta 307 zcmZ2`HSqt{zzJqd68;-4gap{y{9429xF;(zicY@3Co)-2fP1=3E)&n@2?F1B*hKwX z!}%E|Z*-8_yxg{iiOmnF_>eA;ueRCWL4=EGqWk1juUHl{Ve z^3m56I?RiknZ^Ml-PmbF_x<*98iyZT5E%;bL0uG&$8Pmc_)xz@+(@SNkz9 z#_h+vm?Wjz^-`IDm>Gy!fS47C*?^cGh&i_FrE>l|!E9z}J-u-vi}Q2=e^!O*f6cgf z+UMzU0WmiagV?-4%m>8$+vn*CFtfKWF%vsFZvy&eFz-A}Oq diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index 8d71604e21692c16b0c3e8235e92146889a948fe..5ebf66cde8c64ae2ed580b91834f388cf4a88ba7 100644 GIT binary patch delta 307 zcmX?iDR9B%zzJqdvi=(_gap{y{9429xF;(zicY@3Co)-2fP1=3E)&n@2?F1B*rfbh z!}%E|Z*-8_yxg{iiOmnF_>eA;ueRCWL4=EGn)~EbuUHl{V`JmyV_xmYycoA1^J0>e z^3m56I?RiknZ^Ml-PmbF_x<*98iyZT5E%;bL0jG&$8Pmc_)xz@qt>SNkz9 z#_h+vm?Wjz^-`IDm>Gy!fS47C*?^cGh&i_FrE>l|!E9z}J-u-vi}Q2=e^!O*f6cgf z+UMzU0WmiagV?-4%m>8$+vn*CFtfKWF%;dj^NkGy7)dwFj9B0I?tt3jwk4_8?Occ@vQfk*A(_@XuZ0 R;I}4man`~$kE>?w1^|tgYK8y+ delta 232 zcmcb9Ik5F|-~=Q5Stf>`GA;z`#e1XX7=_arUF1L2*g4_EWCY*sffIZNV({r)Khm_rNu9w OT{JIL)%@_KpLzgiFHyw+ diff --git a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf index 5106310f..5e34db21 100644 --- a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf +++ b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf @@ -30,6 +30,7 @@ _playerDeathScreen = getText(_config >> "playerDeathScreen"); _playerRevengeMinAliveTime = getNumber(_config >> "playerRevengeMinAliveTime"); if (_playerDeathScreen isEqualTo "") then {_playerDeathScreen = "TapOut"}; _tapDiag = _playerDeathScreen; +// diag_log format ["DEBUG: EPOCH_playerAliveTime %1",EPOCH_playerAliveTime]; _doRevenge = ((getNumber(_config >> "playerDisableRevenge") isEqualTo 0) && EPOCH_playerAliveTime >= _playerRevengeMinAliveTime); // test ejecting unit from vehicle if dead client side diff --git a/Sources/epoch_config/Configs/CfgEpochClient.hpp b/Sources/epoch_config/Configs/CfgEpochClient.hpp index 1b9c938d..97218224 100644 --- a/Sources/epoch_config/Configs/CfgEpochClient.hpp +++ b/Sources/epoch_config/Configs/CfgEpochClient.hpp @@ -103,7 +103,7 @@ class CfgEpochClient playerDeathScreen = "TapOut"; playerKilledScreen = "TapOut2"; playerDisableRevenge = 0; // 0 = invoke playerKilledScreen when killed by another player, 1 = disable. - playerRevengeAliveTime = 900; // time in seconds player must be alive before Revenge option is available. + playerRevengeMinAliveTime = 900; // time in seconds player must be alive before Revenge option is available. // include configs #include "CfgEpochClient\Altis.hpp" diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index 3bdccbd9..2c265988 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=569; +build=570; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index 3bdccbd9..2c265988 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=569; +build=570; diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index 3bdccbd9..2c265988 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=569; +build=570; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index 3bdccbd9..2c265988 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=569; +build=570; diff --git a/build.txt b/build.txt index 7f18471f..fa67f8f6 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -569 +570