From 9833a117379aad2b23a0af402e65db410febfadd Mon Sep 17 00:00:00 2001 From: vbawol Date: Sat, 4 Jun 2016 14:04:55 -0500 Subject: [PATCH] 0.3.9.0492 add missing create marker sqf --- .../@epochhive/addons/epoch_server.pbo | Bin 420686 -> 423512 bytes .../@epochhive/addons/epoch_server_core.pbo | Bin 21138 -> 21138 bytes .../addons/epoch_server_settings.pbo | Bin 403200 -> 403200 bytes .../mpmissions/epoch.Altis.pbo | Bin 1043509 -> 1045041 bytes .../mpmissions/epoch.Australia.pbo | Bin 1041745 -> 1043277 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 1042838 -> 1044370 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 1042677 -> 1044209 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 1042653 -> 1044185 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 1042674 -> 1044206 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 1042803 -> 1044335 bytes .../mpmissions/epoch.Esseker.pbo | Bin 1042641 -> 1044173 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 1043080 -> 1044612 bytes Server_Install_Pack/mpmissions/epoch.Napf.pbo | Bin 1043474 -> 1045006 bytes .../mpmissions/epoch.Porto.pbo | Bin 1042788 -> 1044320 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 1042825 -> 1044357 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 1043059 -> 1044591 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 1043069 -> 1044601 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 1043074 -> 1044606 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 1042801 -> 1044333 bytes .../mpmissions/epoch.Stratis.pbo | Bin 1042649 -> 1044181 bytes .../mpmissions/epoch.Takistan.pbo | Bin 1042759 -> 1044291 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 1042631 -> 1044163 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 1043078 -> 1044610 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 1042727 -> 1044259 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 1042782 -> 1044314 bytes Server_Install_Pack/sc/BattlEye/scripts.txt | 3 +- Sources/epoch_config/build.hpp | 2 +- Sources/epoch_server/build.hpp | 2 +- .../EPOCH_server_createMarker.sqf | 69 ++++++++++++++++++ Sources/epoch_server/treeView.txt | Bin 8602 -> 8688 bytes Sources/epoch_server_core/build.hpp | 2 +- Sources/epoch_server_settings/build.hpp | 2 +- build.txt | 2 +- 33 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 Sources/epoch_server/compile/epoch_server/EPOCH_server_createMarker.sqf diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index 49fe253cffc59092c0b95e10e85fea55ca713b04..bdb8fec9ae88caba824c10d261dc2ead7395b1d7 100644 GIT binary patch delta 2424 zcmcIl&u<%55MGmZgH4^PYN{rXN`uvw1lEb|gjR7#Ro6iwL2=U9G@!_s_4?U<^{&_5 zU8gZ2xcrdl0SSr^dqB_%iEB{l!BQ&(S3p9XDh}kv4NxQT4>0fTt`kc>01~p^j^2AS z^S+t+X8hB`;a~n3{`jT7p^@~hm!A?J4W!qO3b($A-TnNx;GreisI)Hk9~TEl(rdf^ z*0F)p_ud-#;c=#YZ{g$@zQas^ueCR{JUn%7>U=CT6AWzQdi3Die4VO=*{SJh>+;%_ z_jZQcJHx&|@3deqYTt?a2AfHP$QA)juHiB&#DJo10NEf$L$4AEN`_vq0Upt6fo{-3 zT~^0~fndO&(dYCyO4mVwsD%4rK1R(kFo>pGglrN8iuI~uQN7CTR%AogP?agggUx_H zXO*c5CfX|&MBh&(Y-KPpiUZ62$H8luQBK_nZ;PU zphm;faY$!Y7gF=1Y37`j2@%%30L}4s^eX}hflOx^4KI>a3%_htg55{`39VcjfW)QQKDc$Gtaa*s_6Bq<($9^ z5E~<#)LNrfd5aO5D{>;tx+)%Dyh{WCc-LeeJu*cd&pFKv1ZHO;6dJS2q`GzB5KPM$ z^`aPq=lH%r%z20P`ajWWRo5XVF zA?Fbe1ul8$uD^~3?>2{M&OM{5(+gb~Svz3+yM9@#pj#$pwwpa2^HxJ0E_-UQCS=%9 z>_3fNLRIJt&;v7N|8?HBXvt;geYeLPYc_Oy+TsOT;@8V>mzgu8dm8d9H09DYcKZDZ zhQ2_GGX7uMzTbVvTNl6Xw^I>cf6V>oD$0~i>3=e^TfW<`ez1GrhwCw1eYg&_ckdtm zWJOEB0hOSLkkms z6!oh@62F?D**6N}Nn2OM5&L#p9BhBNCWiX^m(Z~xRO}l$G1-3bx;Sv;RJV0bP`DQh p)pS9%hbrPJ`}?cnwZZVz&GPDxzou@!^G31n-A_M!|GT@N{S7s15^Mkf delta 210 zcmccdM)KS>$q63J*S-Z!^p<9;3ib)-XPCIxXyd#mywiP;G4gD_%D009B)xfp_##GD zkOHpB=92!B#%7krCQ8=4T(v;_e)s;Q(#)I`TN4Y*$&LD9&0i(Af0bl>yI}H$HBOV~ zyyj@6vUyJku|ivK5Ma`MC4xjNV0Ca(y?S;MAO;mZ>4h F4gje|Orrn* diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo index 8c1d24b5d1bbffe40f858f2ab3f425182d564f62..869e1586cd9622aa32975a73832d16c1721f2b03 100644 GIT binary patch delta 139 zcmbQVlyTBh#tFX6QZm641EiV1@&#|qJH!OyPBvza0r4kKVh)rtF*7kYQL^Ucss-Zr zyZ0xRX6B^WnphfIPd?}xwAr7f%9G!nA(J7UA(0`Ep@boyp=k0AUw1(>1_K6D23H0v n1``HL21f?x%?5scEFxA6(%bKJGcV$DxVrVki}FNK3!%*bb2}-( delta 139 zcmbQVlyTBh#tFX6H@*c;43K874fffXcZdnZoovh;!(12aGkFqopp>zhrLmckH7{2! z5WnBOKdCe`C&kvp!qR&3LD!(o{w!6V`~eI_4EYRM45yY%iK9j7Q059mFyJz+W*Gf_T>y^0Mtb-bN~PV diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo index 71d2a2bff573d910f92af70e5a28e55d1a473c2c..a0007f45c42c8bc8b66931917e4f60019158ec5b 100644 GIT binary patch delta 213 zcmZoTC(&?DVnU#Uj7)I23j+f~QfX#Rie5%R0g#OVKlp;f`GMTz{JgZxbiHIWX`tqf z6KAlofs|e1oNUN0I@yKYQqsiC#N15DnwP5sG@#L}>N8hiURc19p(0%B$$ zW&vW>?bF!V4vX@;Gh{NPGbA$PF_bXmGZanFkY#fhG-EJeFlBIMuwpP_uw-y#aNd4E emQ9CKlb`FUxX>3Yd%(m>4{ zC(dAF11Y=2IoXh1bg~P(rKGW$rLm=wH7{2!5WnBOA8fX*iG^kJH1_ss?2JIn1jNih z%mT!$+o!R!9Tw#eU?^h9XUJkmWk_ZyVJM!SA50UPrkt;j_pbB1D)Mgk3;+p6J+uG- diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 16721e565a33d057c1cda4c3daa356f4d7355add..f8d74a541399129e2e701571d6c367d743edaf3d 100644 GIT binary patch delta 979 zcmZ`%T}YE*6h7wMR!+}kk|k;>go>1#&f$a*)3K|l@UQ5?R*szcv$pBnrTKPy5Z^5bbjj-R4*0y%vY(MAPP>cK!-^j5=&BWOpL5yu-oCPR-?B|4LEX)Gka+i9oLty2^~Q z6_ytA_`H1Z7evQrR=6T}??%u_rC>gw0v#BcIR7AI6uSWh4xaDA6QCG*T2NZu{qT;gPW~6*e6^k zc=BbJ2v%b=OB3T}1J`x~S4JRa0%B$$W&vW>?FO!F<=xXAxmi=&c`mX6F*^`*05K;J za{)0o5c2>r?{=Pxd>SYC0~m@J@)@!iQW=sNN*Ic#JI~~I7qnz>WiVhcW3Xay0@4Ny zrqgH7_W`l*+?X^0{; zOonvMa-*x7bgH5N)smNdR8I}EG|LklA%lWA9pD6MOh%%dpU|Ux*6C7?Zb$^F3AaH5 z((-}NOLBqp5?2=aZjL19I8VOB_|l%`6mOhst>=q%c%R0((t3W2^W{CuAs3e|hbB8) zY?GVw>{MROb)DSii6Cj11}H49ckDhBLV;nNezY`1U9j#UU<`IUy6F(tBD+Q3VC|f0 zshjSgZiD>zy+!vijxMv&Fy0aLV`@p$CoUEJ88R#4se{CRh$z|+?vT_!XU}2s`%!9G z1~t5Y(c=)Mloe z*kVuO%_cjuWO|jgtOn|Vbd$`)I9JNHxj5JQCqNGnAHs6g7+gtqmspO2`&WA%M2bg>AP5WoK!nR}L&ZM6RCJ4f@%LZ=`8nruGtdh%_J M|Hkj0<9{Uf59l@@$N&HU delta 291 zcmX?m&Hmyk`w3>uPre0hw0v#B_V8O!I6uSWh4xaDA6QCG*T2NZu{qT;gPW}**eBd1 zc=BbJ2v%b=OB0J`1J`x~S4JRa0%B$$W&vW>?FO!F<=xXAxmi=&c`mX6F*^`*05K;J za{)0o5c2>r?{=Pxd^QL90~m@J@)@!iQW=sNN*Ic#hfm^n7qnz>WiVhcW3Xay0@4Ny zrqkC?;&0p@GMQgRVEcu|{29E{8@BO_P20rJH$7$}zX5``VI#j4jOQ}_0#MQP4V(D6 zrl)M;H-mF+rVA|MSK02jjbBQ8`?H7q0_@Xwz2dJIk$YYflkXuu%ZBUpbHPQci~ct= GZ3F-W&1h5r diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index ceb6498ca347a583bffa21c7a6c54500619c16d4..9680145652722d9d7840d6de8ac1d4358521d9df 100644 GIT binary patch delta 1011 zcmaJoQWYuy*opQEZ;zdLkLS1MM z_I9^~pqoOa+<|@wqOQ}7qARl{1VIIL)0I8nxzJ5AKAv;l?|jeueDCwVC%x*QUGvX) zijOjMJhC%yZb%oQ>z{4O5Gl}*LTAeoN@(= zfIUDlPy&>iuAr8@RdiBr-z@2ng+C>YQXj0fZFAInx_sV$e=J*A9BK!q!Y-wN(nO}+-j>)XCZtE z(;2)C8j|G)957S&IaVcap74GdTH~?|^D()GFAXCoFOC(3p%@Jy8UrVZxEEgf#CDfkEM}`R z6rxKg*`N+QFVGbuf6%e$TqS zoi0PZp!qVk#tpK$!R4&Zg81`7D0vJ8FXXtbzHsVln!~7U+^TUxX1>7FbdI$hJavWQ zslUjeJf6K!uNUXz+bZ@Ruy;&fIdRI5ubisgY*>6=fAF_^w#j(+IrysU$TQRX7p0gX A7XSbN delta 304 zcmbPq-+tO<`w3>uFTMqBw0v#B_Vim&I6uSWh4xaDA6QCG*T2NZu{qT;gPW}<*eBd7 zc=BbJ2v%b=OH-p}1J`x~S4JRa0%B$$W&vW>?FO!F<=xXAxmi=&c`mX6F*^`*05K;J za{)0o5c2>r?{=PxeAP$!0~m@J@)@!iQW=sNN*Ic#Pn*W?E@;W%%3#1?#$d(Z1f&fZ zOsBt_#^1hu=5&4)f$gFz_%nE?&tJ|jGJXDSeu3!=xAGexaldZmw}Nv;riX9iH=2Hb zGr!pM`P=v%;4H4`|3MP@4}qqfpU*F_eey1TDedjr&-ew{r~iM)UoWy<#Aiprm+1#i QhxT-6$XPy1Qcau!06G+Kw*UYD diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index ae32121bb6b991f981f3930165929cc19949e52c..7fae0d502c624ade3767b97fab9a6678df9b1c95 100644 GIT binary patch delta 980 zcmZ`%T}YE*6h7wXHgoPM6GTz6ix3mtr_SNL5z8e6fi{2Y%4UsRsmZonUTIVab)!fg zh<=c;8xst*g?Ld=M0Z)xAEY%6f(Q~S=ns0{PxEIOAJ5+R?0e30o^#IkZLVthZPkD) zu_(uT$Nj0ov^&S!%rrDol|A&%oh6QECd;JX-IijqvA4PS@X+&`LrG4T(_MB>_w?(Y z1YjGG2xvf3RQH%7ml8^4@S;{D6F;=Pe(RhGFas7K8Q2b_09GJ1YMryi9&#-O=s5YP zlfrb0g7W7w*QUEjr*iU8B{|7W)wEX{hq*U1OhNMFX+n;lB2c<2F~z{V~>}-*54WRGGNK88ZKZ)8zaV>l?yXQ(UE^s2aH=?U1 zS)SqY0@am|j=^`3YVg}ir!kQhqt_7PF#0iMWcd;AlDZKTRqDn#))NB|QE8px80RvB zQMg%pjR8?LpgL;D*<%zAZRI6Cp$XJBcsWY#GWdjdu6xP-f29bmXy~y2^~Q z6_T^#>@e)xx5$tOV{A7Ej8O%peufLA?+pghH_18Cio2X$C`V%K6n%kBnX7YK9e;=# zls*tyHuZ@vX>w0v#B_VQa$I6uSWh4xaDA6QCG*T2NZu{qT;gPUzauur&A z@Z`%b5v;~$mZoOS2CnS}u8cs;1jNih%mT!$+YMaV%DbmKaC3GvZ<+CbZ?JjFTiThX?*+=HSNwa$^WNr|jrscuY`eLoT{}PhA#^U^>+|{>u4&;3 zEt~`F0CIsmAm7x&w#1E`I+?nj7n0O!Ugd-{Z3FCp1K0`d0tx^pP-r^SMQ>hl6ZKOs zMQMl(x=gx!zR69+KGNt2g{hIe&H_*EYBC%Q85U0ajbsSGejM*hQUd|Zbd0=GIO7+Ev84+ z6Qv7KtWyZzF1mtVbXZl!aW+uNrdSeu%N3&Cg?^RDYR86qKSC+zAsN5LZb>b$>)_S| z>kNce4T{hJ_EAaCbG;SO{eONN{Q4lM8-B4YG5fZ6O=MB4{!KLyc@P<(N{a8GMXG}8 z?YKJFy;!PsLD;H+xj3a#1K9wz^RDl|5BG5Hbi68&g-)9KfFuOW>$%LsJP9 zO+6wVlTftMzoWI{dc?Yvh78n&;DTYViJnEdx0moRU0?8N{>Eb^t3NAFo{1lOall*j Nu{$T+bEvCx_%};UALRf5 delta 304 zcmcb4*Z%HB`w3>uAHD@`w0v#B_V!y)I6uSWh4xaDA6QCG*T2NZu{qT;gPUziuur&2 z@Z`%b5v;~$mSzUc2CnS}u8cs;1jNih%mT!$+YMaV%DbmKaG1vCLEw_f{Ch zKRnQsS>obi{v3fV1`h<4M&Y@JbG*4!Vvx!27 z$it@>nL|tF=p0s*lJyPBTikG#UGvzuU%mxxw0v#B_VHU#I6uSWh4xaDA6QCG*T2NZu{qT;gPUzeuur&C z@Z`%b5v;~$mS!f+2CnS}u8cs;1jNih%mT!$+YMaV%DbmKab(GJXD5eu3$Kx9}SvaRayVTfw<*)9ttL%S~tA z#%}>(MQ-CanQs4%pJ%%N5`Ky8?|1S`X>V_T$}hk^J^CGgy@-UfLRWwld+UiU%FvfNNUo}KUA_dL)0^L@XTy+2mH zQ)-c?x+CfS-Yhj&cXT66&v>h*Kf5cbVOf$NhTVN7(mw3yu0K7!;yYE`s5U9;grZF< zS^=YwQN*w?icLk6VmAw1bmxY}M{~a|`zLKn62r=n8M_#}86^xGqtvu5l?7j78}vgj zgkT5^7zUlL#Ienxf&xvTfd?AF4K2`0D{;J5VSo-{UIEsGAqMrV83n`C2#?tv;w;4f zgrS|kI$WahXLy3jW>GecS-etE;E4tx_XJy_ld*?;c|v`JduZGo8k&Bec4XjpScPsbX`I%oLXrg-(%%Z|&zA zI?cs3v|DNJHOf@~1trWQ)A(1cbzI)Lx delta 294 zcmaEV&;Iiz`w3>u-@gTIw0v#B_Vrs(I6uSWh4xaDA6QCG*T2NZu{qT;gPUzmuur&A z@Z`%b5v;~$mS*P72CnS}u8cs;1jNih%mT!$+YMaV%DbmKaet>9d@=?Av(%S~_D z#%}>(-P*=)GX20iexB(Umhek#FWAK|rM;cw8NUGg^gHkP>qVX$t!q7egu!sf2Y1`$ M*H*04mo0b-08&hBX8-^I diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index 93d2b180013a6bda3e4148fd294296229bbfdc7e..70f667d7b15ed98c956417da0055b9514ef4964d 100644 GIT binary patch delta 1025 zcmZ`%T}YE*6h7*jUphM*&QKE)GDg|@(o~ul%b($uAgHrIP^;zdbbMR>1YH#fbx~vF zi7wJ^cD-=6n+S!vG?+mVQP=_zx(F}3>v_M4VmMx&z31II&vX91blSV|-TSnuz+2Vx z+VlI0wWX@3pDFgrTN&H(REWN5)m8$Y(PC>2_w--55&P6}-O|w1Soc8pE$F^HARj0I zEWojp?z7H4&a0Q`BTI)Q{#vRRY-uY{2x!1@pa>`iY(PoMmOioeo;zubMrfF(C_>X@ z$hT+Q>1d)$)JQ&RrUvp*E49nzMZV7wGAMxK2PZ(Yvb)G-sl+1J*d59-42b}B;WlVO z(ra8NLvePdHsd^AB16yFDcwoFwr|-bndIi|v-%6XCs(;X`y5#1wtdSc@Ae#;gfeWA zA1~RiyqaTx+~$cOX_zJ`EYY{@J{?4XVVp6vG)053LI{|J-G^@c5{14*cGvyBNoy*=QK=2>LO#Wa9&$mBbP9-I8kRxb zG>Lm&C70b7?2^zDYbLQamwcA!2W1p>-GV^iKWfg(%#9t&;yOA@1j<2VQ01w7;e&?s zTnq!85gawgR@iEq22D#{T#aIfZ8EgNAw>WH delta 290 zcmX?m*Z$%~`w3>uzrO`-w0v#B_TyVnI6uSWh4xaDA6QCG*T2NZu{qT;gPU!Buur%_ z@Z`%b5iG`Lmgdd+uI>7+j6lo;#LPg<0>rG_^k E09mXXcj~< z=#6e_R~aQ0k>6cKQ5eyMMOQ(TB^X_I5d`&|Pthqe4$pVqbH3;Od){;LW8HBHDYa?Qz(5BHvoh&F$WU$q!8jEH$3ms`HwEMDu3> ztAK340<1PPzjfep);76z$ZA}w zDM2yPWmq`i^iU<$lApFy4f&{n8s)R_XmNsc3S+gwCrtfR0iOX%7>90fmBXq2g>Vz5 zz1Vf?mMbaVDf`CRW{i&U$wKM4$whK_f*n#k!IcZg-3yjO-b}D(?ihK(d9u!6Z`v_# zaE&_JAGX__iQB8>#>sg2@Loa!aoHMxM|H(0x#S%AWPM$zR5wwQnV!zF9iKQT@lB{Ya z2OTb*SW2Y^*h(uMvi2$w_Zx2wE-lZQ7wY;qt}b388kBEAo0yMOPP5yXnPx|h?D)=h zUdEH)47;3-bR4<-cv{dBL+cU8ENh$Qt|RH=Fh|ydn?AF&K?%;XJ0npgQbhGobSSQf zC7B|&g3y=#y9NAZ6H#q!o|Emt4Bp|dAAGjx-qBZEyqfdxo?$H(IJNcGon3z>{{f-6 B7-j$f delta 298 zcmZp9Xy0+weu5eE|8GGXEni!({rMIY&d)G;p}o}P2bPl4^)In;Y)-Yz;AUGA>=SMi zJo&Oq1dFkmrFpZyYrDQHBM>tIF*6Xe05R)!eOI=M?&*%)tf}oh7ukTA9f&!Am=lP( zfS4PId4QOAJI_VF>|^`^3`Gq23|S1R49N^748_yirt`ZCS~9pY7%-SISTQ&OX#)n+ z>G!7dcW&>V!LK5)oqZ*L2JdwK#rz`EweRo?OrN}s-vEjGd>g+N64!M*zu9#8Bm831 zCvN9=fUur#=eL+sf&0Bf~U7D@&}_bm?e9h`Hq@$(VoYWUH2%I_2AP8g%L)6@)eF zhldiWLk7jf!)FHxf}p~SbtviLVL{=+Q-|na&-*F<8IzZ1-}~G9JkRgX`#$dih|9Gvnkozncp!FHy^L|sv0(N`$$FPd#S?CZ+WJREF4aw+lEf6-Fyt*N@>4ve@1 zS-=h;8?XR74R=5rx}W8dhxaUgN&dBzj@ailzzW!aUBGT22e1RVhJ8NI`jH!{n>r~( z5sFbi>2h$48=YRNq#6oPEmf0`>Zw6)jd8pnMmmMD+Mo$joK8S9L@^^Z##IidIt$^S zFg4+;Q;(Fs=hO0fl5NJGS9~K^_!;k$l?ArTgu#`Y!aoMrZVH1l>{VgDJe}b)>pQ!w z%&r(2L|#pOs2-C}tHi=gj;$aJnm%jCE#RlUgeOawTF(+E^8I(8&j+f0Oif?V9v_{Y{a04I G@a;cma3GEV delta 293 zcmeBsVn6AI{RA^+rtd);Eni!(F?up_6gSt zo_yIQg2mX((!5#UwO!wp5r~<9m>Gy!fS7f=zAIZr_jE^Y*3@>Mi)=v54#XTl%n8I? zK+FxqJV4C5o#!GS`w9L4h9ZW1hAf6uhGd2khT`c;Gx^;GEg4)H3>eH9tQeetv;l+Z z^s1Ts<=aJP@v8`IpSX%YgLk_AGJcWi`*-jQOqbokZ-B%t+`(@J=ekXg-_9>LU3n+J z1%y?(liy@|{6~JC>G{j~CARbL<(JalzWfEh0Q>ankNou_yQ}@{4rhFfSGeRUCCPVw J&xfhKa{#XUWf%Ye diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index 6f3a7789ecc35b1e3808b468fd0c7417f8950173..a0653a3213489c48556a6cc80a9b1babe8e9f240 100644 GIT binary patch delta 981 zcmZ`%Pe_w-7=BINR@;0P1xXa^5KGLQe>R+#VQm-OMW!)kq5t*=mzG{sdpI0J%TQD8R>e*$K=%ntSfbW2s??r5K(C%8H;nB&Ztb6-ey2l zjpZB#@f_3(hxhW5ncxGp2VO2yaCDiE?pP_?zfhD?(zd-R5yuY~O=6TE4bmWBwi#&d)G;p}o}P2bPl4^)In;Y)-Yz;AUGJ>=UjN zJo&Oq1go)`rG-(mfor>gDq~YfS41A zxqz4(hsB@D&Wi>C3r3tBR`G8izJF<3D;0cisU z)9I(C@mFq7pU$r$u>J9J{tVvf`3v|(rpIsPcYw15rXSwQZ-vBF+{SM<{rqBnvFW+n zfa+i@uIXpD@f(5EaZJ}=z%R2saTmXo_V%Ao`32agpMA$)FEYix^kar(#^JJtHJ4(t LdQ4TU%q{=`%s*-4 diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index dc17d65baab5b63af2a3bb9fa5e05e3f379b9e25..f0d1b303166216ab3794bf0e8af3b604bb561e13 100644 GIT binary patch delta 978 zcmaJ!Eb>W6MP`mRmv~IZQ1IOlg^^Q~vv>Nl4fSl08%m zJV+1OOHxS~<@OLk_JI%)ne@_2X_7(jfp7ipUzr&*F28&4Irn`2&b>bCz4q06%bj|p zu2Vp zHUOzW8jv1$228y-Qp)7^P?}#RmeRHjX3v-aGhhKSfJ`6@$Odxa*)zEd0!-<KhRkWU!Vo0M} z>cH72{V^^#q8iMu){}@T1Fv|KT#j+c|C3`Ft0itvo?J&OooEfoh3|5)bdQ20#Z>8f z4jNoqu@p-_+!a?E_~=$72IKEzY~O8OAxcu_xjcUjYhdpv`ovtMbdHPTKjzqKmi^y3 zm;bSo-~t!fs^|=o1@NUnCZ^UQwncXASXOr;e_|fS%sQayF>33R;35|%HB^a|q52>i zC|8CB$s*RnpvQQY`FY-G_QMIYRh92rrfOmVU+(u$zLZyfb?ME{J0s6u+oSgB`@WA4 I_FR1Y2MWv=y8r+H delta 309 zcmZp@Z{K;@eu5b@*Y}`}mai??*uMvb^D|6dXfHMSfu-bh{Yz{dn^P?_xY;%a`-Hm% zPrmFD!D?(~X<^oE;M#8B$_T_vK+FupEI`b<-N2QtynDJMH*0D;&qX#MW(Q&pAm#*O zE+FOxVjdvo-Oh87FX2J31b4;JLjo$)^`(Ycu$#jLS{3_eqcJWJTZrQO+woGD4(_i_^fO5a7BAU26cf^d;b zRl&=@=iw?3p+DPRf@6(a$XZeCIUXcm3N1pH9l(EGggu06nC{PF+cw5I0$YlS_#n#P zQIVFci&&pCE-I*47hpx03%USN!bRMl)9o#6Bwv>-%+R}A48)@SRuhxtWsfP$N7r};D*X=xL0R-KHUJF)O`^6b0S1bln@ K{o{;brQt86k{_}F delta 294 zcmaF=!2a_U`w3>uyx)U1TE4bm=UjP zJo&Oq1go)`rG;g)for>gDq~YfS41A zxqz4(hsB@D&Wo2T=;3tBR`G8izJF<3D;0cisU z)9JUT^OtWgo58Olu>I2t{tVvf6PECcOjp>>FEG7s8@~Y(_tG|gD>&C}`hl(da?@M3 z^IJezx3=?}Oh53RpJ)1orTh}x3wHBMX>aFv&M&||{my&-dXdX3uIw~gZCvPH6Lw@09twY%|W>;ZBFlkFrZ5DRzoI#lEFu-IC>$i4+GGkF5sV#bvBG z?ot;vx%M1UOl#~Z+pId0^t1eeI6DYg}LLtY&gC?&)X%ZU5yq2?LTInqgePCw>plh@-O#W+bT!N_{OLFK4agca zl|a$d8`3ZcMa%y?S|hIe%}aUr8R|lC!K@cG-$$`KrtvPvzu@!z8xOiX_J>LRQfbxA QM;{~ceZ>b`f1ca=8?0|8f&c&j delta 304 zcmezQ!2a(Q`w3>ug5QHSTE4bmI&d)G;p}o}P2bPl4^)In;Y)-Yz;AYzq>=SMj zJo&Oq1go)`rKNGRfor>gDq~YfS41A zxqz4(hsB@D&WTc`883tBR`G8izJF<3D;0cisU z)9H7o^Ve^0n8B|iu>H>p{tVvf7Z&o1Ojo$WFEG7h8@~Y(_s%wcD0&IKx}0vDom}1&<%Ll< z#-P`WZtA8%AVuK0NOI6mkRXd72x>GaM)U`C6TRP2bdJf#v-7?Cp67XgeBaH_-hVmo zyu0#3i~p(T_ep8E#Xp3Qe&B6N=RA$n{!x;jMLgrRQa}2Kl;QNJ-t*NR?oO9yR`Ja# zz6!=JMkS+)QLQUJDRrm9Nq28o_0p5SRc&*oHHlHfkQuufdl`(b z48kx48pJ`RTZDa9Hz?2vKInoD@IW{8P>%3Mg9a)@cm-J#ffO8P%~jC!zyhAISjAbG z|B1j^{;DuR^I1Ga`!gu(vl+Z>rt9}{AH~0*iL6Vg6oru`>?#UhE}>h5^<>uZ%;wHS zaUGo^lnIydaE-=!lALGY5!wh}q1-yjl_hyaxtA#j@h-uf6z>PQjUZ(oqQhX?MK58v z#MP?M%fA=l3eO>AbeQB=<1P#@y7m^2P$+{ILud?POBiJnA)BJ*MRb+3-ej<;7|Q^} z_&XyKQ`;)GZdsSqR4NRzWSnanffyZF#e-YI=IzZC3sWUIY~`sM`%bdIC{C1_r0gQL z8|^rDQmCvM<0U58&3iFNmA*YkJB420G5xiUO-JcZ9y=(MN2y_Bp3D??lZ1fC0~7c1 z=+M9aKuZm+yhC|!4~(*D37O`9qRlD}eEj0VTx&v9N*{iqcslGHbuGLv F{0G&17~TK? delta 294 zcmezOz`p6K{RA^+vF||}Eni!(34ad?=VzF_&|Yft153&2`j^-^Hm6!Yz_s1Ll@W-UfS4JGS%8>zyMZfPdG~ZjZr0Rxo{MZi%nrmHK+Flm zTtLhX#5_REyPfAEU+yvf0EQxle1GTKF`5U*l&fr%O*v`0;KZAGr{3ZM%)AhIW3rz3b#&3YceYlO^3eI(#ets*z-1N!Y z`7I!#QAZ3oN_7ozRc81%?sQS$AvtqpO81t9s>e*fn0S4`N`r`%L98N4xB3>W zz8c0JMlD0fs4H20`sAIOZc5$Od1>j7u6@B+)-wzYg|U~hk5SJsG8#(8^8T~Wu^%EZ z1|f(+0;WKtnGE(fI>8DK@IepQ!37@ZqgNT6#{_5)<~78eFeE8O*j(}x9#$KLA;c14 z7~oxl37UR}woDF9B`t@S8#4FML_hM_yLC`0Sil~6d-|4b#R7KA+us77+&UQPTv7g3 zNd1I5y8aMVwkeGxV3sSv!QwChak4!@^Pwmw7Uvb=QerU5rz`A`2wIHyD21|U*-d`i zOEgIXKTPsICxTPz0d|tQh>9e3Rg0jyxCj!7jue3 zP)5tHqouU6hN^*s$9!BzH;@@z#HY@gBGQ8DZszZmNz zhnSVg%~f|4*$7ARm^7$3w(O=j$PTkoXVV;H|Ls>K$4t{3T=~l{m^NK24BX8Ay7l^Z P^4N;!en-)fy8-_I$UPlr delta 294 zcmaER&;H{j`w3>uQs09%TE4bmllUGK&d)G;p}o}P2bPl4^)In;Y)-Yz;AT4z>=SMl zJo&Oq1go*Rfq_x8for>gDq~YfS41A zxqz4(hsB@D&WOQ-R>3tBR`G8izJF<3D;0cisU z)9GiY@i%WTna-~wu>Hew{tVvf3wH5~O;^~)&o{khE588}_rg|wD>&C>`UjA@3)}d) zrnhY4H-mF+rW-8dSJ|Goi(g86JKHmU0ru&)-tpIq>{%-Py{A9;Z(^upV3Wn)wCYoT G)&c;MEo(vm diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 23c41f46dc35a4d220f99d79b2027771ade4e6af..c93e2c66b47dc1384f94ec64e2be4f24b262312b 100644 GIT binary patch delta 976 zcmaJ<2YXX9pE82UGxhy;l?Eyie(5cvoR+yyO)7Jc_u#teOjr)P-pV0gn zz!4x5umDGsn%_G5D5FXyA6k4e|I>1MA~$6PY=9le0=BD!BEprp~Q4a+u zOi>ynT{fR`lhZ>LR6~BcNN(~{12sxrjPDgjNv9xIJA8sPLgnxorD!q{<4T89y#=5N z(p8)~^~;xOz9cgVwkKC-`F5VnKjQ+KTV#jyE^hB|af52ABUoIfk)U;+cb!N6|_Mts%K|J!hA^nFdLUsmj9~ zbhz|jDV7>=S6u1fV@Q$Mk}Q46#pi9iL`lm!R~PPM4eVV*pO}k`udyrXS!ah$9&d0y z|6?cdO)hgb(k&$O<4b`|Ol?2{TdbYkQHPK}Jr8qc1JDecwT(%9i(LmAszl0AeGna# zE5o9LBDTR`*nF0%4L)Y`!3ncfm7g=Iihae8yZnvs7r5$98gt`Y+s8ATzjy!mT{088 G8~Ov#HX0cK delta 308 zcmcb5*Z$^3`w3>ua^HhCTE4bmll~qQ&d)G;p}o}P2bPl4^)In;Y)-Yz;AT4#>=SMf zJo&Oq1dFk`fkCsrYrDQHBM>tIF*6Xe05R)!eOI=M?&*%)tf}oh7ukTA9f&!Am=lP( zfS4PId4QOAJI_VF6G!+17>XG38L}8s8Il=F7>cJqp33hoXvyHpV8CF;V8!4BqzxEM zr&~|suibuU8o!Fb_K4;D8NAaI7V?Wsuerr9F#X9Eegh<~#a4bRB<{4W{ASY&4)Kdk zx7otaG5yt6ehVb7!!~}C=>=Q(RkmN-$uFh7J?|;M0Q+=?e+>CIeE7Q`v4VFZ6^Q# diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index 286bcfc55d92b0174eb79bda6abe19bef6879961..bb4b635b6dc5cb62745f9caf326adba296f4c17f 100644 GIT binary patch delta 990 zcmZ`%OGuPa6h7wo&!4ZOOcu(Rxr#EK(Pjpx%{b_w5R%}lps)!ivwRHyOipe}Yhl=? zFg&eNDR9$6OC7L{Sy7t;jao(KBM92KZP#~yXdET^`Tl$Ez2A9!=iK+pzBk`}cRi^c z_Qq-N?@F!R-q^}CGT|#2`QgnM$Fios40$hQXy>@Gwd~Bu=bF=LE|1$?e#;pcat2a> zJwPg80n*~mfEK%xQX%(-Ej2Rr$8u;Wb4dfNfDY^h(t!*h6Ud5ZE@ivkaV>RH2L-8z zqSQ-aiMhMFyX+Up6P%60e)&%ULoo&-=wb%h~dEhMkFRUBb$i+q3MEh6lV)j?Hkoe4FLU zq;16fhA~h~Yjd7;YZMtH$T;zw4~z2^>qXtDF@moXs(PpmRv4TZ>}CjRk=J8f zYBGzJsvxzaZi8y@zd%>fkv3Cn1pBB=udz+uj`2~`!ED2pLnoXSy+;P0@^O<$YmTi1_u0otT#tuW*q}{p563cLBVzAZiYy;@~>F3%3tf4Xq3AeP)sU z;@^O%s&&?O@Kg%LQ;)@C_VDw Lq)oG)Jy`u0GKCtD delta 303 zcmX?n&;Ix&`w3>u%HM-FTE4bmQ}`Yf&d)G;p}o}P2bPl4^)In;Y)-Yz;AT4>>=SMj zJo&Oq1go*RfuTXOfor>gDq~YfS41A zxqz4(hsB@D&W{ipG}3tBR`G8izJF<3D;0cisU z)9K5n@z-znn$E8xu>II_{tVvf0n7PCrU%^S7nmNjmEQn~yKF1J6`U(Fonsrn(ew$M z`NgIOY~y!;v$&>j07)o31e($?pI>0R%PxK??d^A-@(Zv}-|&vVLHPL3Jl7s0-9Kh& Ny?%u;Tl(^(MF7ZaX*d7? diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index c10275c86d4672b4fd868db426c8e143c4bf2d24..12a94d9c9d45b4df7ed7fd35bb3b3571edf296ff 100644 GIT binary patch delta 988 zcmZ`%Ur3Wt6hF)P?Q8xy%3P5s&Ip2}_NjBY2z0n%FG8Wtgg_Q8wRDbcxqRuR2O(dI zk%u5O35vkTQXBY?ibXwY(NiS43W6RAdg`s;{Xm_PeEhz9?!CWr&hMOa->o&Rd}+Gl z&5KpEzwrHR)S?ybT}l#*H@tRa(ma&?)1mNg?x{yUCJ*_@Pc2eE&WXcGicB6zQBj%!5kM$XpW7o-PtXpSoC@J%BpagOwY1iF3xjf z&i3Uzd(>8!)d^5cE4IM8Es1mqq^o|;$7Kd5Rf7UNkEu@8 zuTHk{=UjQ zJo&Oq1go*RfuTjSfor>gDq~YfS41A zxqz4(h9dd=^b17jiw81 z<`i_k!2^DgY4iC7wjbHaFQvUb<|)4b`*eeM{PiMBq&`^)hca`ReIyDa}HIy7fXX@CW=0(*fHpcJqHWri(PKJuD7XqW~m zND+!tlysRD?x^sPi`?X=6VyyzYNa;$C_J}6PCA9KdXN*M1T`Y(GR2L)1#YresIwrx zgs2m5oknE!0k;}6_c&4}FP`x}IlIE;QnkXa%=T0!Dwnkt_Q?Egu9T6dTp|YzZpqnR zGPqf7tuns|iWxbdv(*yEWiecqUgo0`#h1D;%8OwQ!%&3!5siV9KpcRVo?A=YU=o{@ zpCDa8#X7a)d5*@>i+>@oq2k3&cGu=lT#a%RrA?ScPRjHbn3~#TZ3j=Ro6?z+VOs BA<_T< delta 304 zcmZpAXy10#eu5dZ?)RXLmai??w7&<1^D|6dXfHMSfu-bh{Yz{dn^P?_xY@1*`-EEs zPrmFD!D?)7U}V^A;M#8B$_T_vK+FupEI`b<-N2QtynDJMH*0D;&qX#MW(Q&pAm#*O zE+FOxVjdvo-Oh87FZ&pO07DT&K0_8mDnl|u2}AMpw(0!tf|d-f3fEUxMAK@#zgfTrwUz%Q`9c{jh5_IBy#`~vLL-@oUt7ZE<9@Z#&#X*x41 PAKhV{ z@U&_)12;)Y>WH-nsZA?2+O){uAZXi0Xwi2cG>${^_})GD-tYW;=iJ#1&&+qvxGQa> zuxZ}?t6Cc_Y-(eQPJ0TXTkg~1+|cy50e4rHHpESBaL_$x~g2&4-DU!;j;k8 zfHc4gq{j`P7I|#BC=-vYb@FE4S~6x^*MJN_2aW@oKo(#Fvg5Y(oV-t5Pue(I+% z4Ny>=lU$$cB7>^PN0+FQ+~lQN8Jpz0r@|DZ0KQiE1Smq~@EM_Se1DQJ*mKpLA1487 zz#61m;(x_nS({~R{Om0EWXtsxJ}G||I7gNi*hp+IC#)RlT4a|P&p1zP3!EwM7r8oV zdt!+z)m9fH28wB|t+1XEM#c~_-ha(!#Qu);;y%K8Vf3UA$x(*PJx3QBSK03Te@u0% z-bbfdtQWTGQIG~?VuqcjSecsQ!g$XT7nI4<9n7a@oAvzU=7*>mdewO5_b{H4P1fQM zx7nT{Q(swk)KUlHHz0OmUSiqgVj2IznXK-7cx8UnJcx?DyIfUtc(`h4y>K5kiyW2G zJ%}pVWi5rLQYfB!EI~@*IS$8b!Ts<-6h|}IDf3oJoO16cNAs?|_~w0*JJjJ>{_y*A L#m899ot>?})PNdf delta 303 zcmZ2{&wlwO`w3>uhTnrWTE4bm)Bhe6&d)G;p}o}P2bPl4^)In;Y)-Yz;AXoS>=SMj zJo&Oq1go*Rfstvmfor>gDq~YfS41A zxqz4(hsB@D&W^{4T>3tBR`G8izJF<3D;0cisU z)9LNg`0KZ8P3Kn;*uHEze+KV#gXR1p(+zI(3rsiK%5Q+gZQIIk1?P%Pf3cO{XnMhB zezEBW+xQ*eEUxJjw(%QHdk8cnVLrdWc9mWHQrg@1JmnW)pFZIof4xZER#VGcR}C0M QEHt*hX^ZXfnlEMx00hKl>Hq)$ diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index d3b84c10ae78f15217d526a6205fa2732ed0eb11..cb76c1c4ade641a7587612a444d0be746a2fd75f 100644 GIT binary patch delta 1023 zcmZ`%T}YE*6h5YIGiPU(A=+DLp659~?^#)PzFTqLwHFUq zeJ>o}PZ%OrUl&s#_ zG)S7nCb*;0PBv;K54BMXImkurvM|BP>I7*N#`1#`rX(E!=N2V&n{czGQr(5{CrszC zYt%1S=ebz|(`=Ty$86FAPx(fLtl#G<8PBjqe!OJcKSx)F+cuAKF5}_1meW0pW?DQ#q~1&noV_48W_}d_m2H7#cXe zSgMaM*s7Zvx<8cfwG2LEtDc_a+6LoBQzzE=SoMYtl6tH-T~Hx0INmjG)L*T!#V8LK z*|fKvt|Pz}ZwY?n`aQWT59Sc<$6IH+@`W1@uYTtu4TE4bmQ~4eg&d)G;p}o}P2bPl4^)In;Y)-Yz;AT4=>=UjP zJo&Oq1go*RfuTvWfor>gDq~YfS41A zxqz4(hsB@D&W^QQ5;3tBR`G8izJF<3D;0cisU z)9J^i@t1E;oX)Qzu>J0G{tVvf`iuF+rmx@1&o@1DE58Ap>j7u+O_$!rZ#LckFi_pz zZTwu*3z4}t)7LNISJ@uDi(g86`{$?p0_@X|zvHhL>6MGq4O?|!({xVOIhjV>N6x*q GaRmV2dS`L~ diff --git a/Server_Install_Pack/sc/BattlEye/scripts.txt b/Server_Install_Pack/sc/BattlEye/scripts.txt index 683c81bb..a46647e9 100644 --- a/Server_Install_Pack/sc/BattlEye/scripts.txt +++ b/Server_Install_Pack/sc/BattlEye/scripts.txt @@ -41,7 +41,7 @@ 7 deleteMarker 7 setMarker !="CBA_fnc_setMarkerPersistent\"" !="\\fnc_setMarkerPersistent" !="\"setMarkerPersistent" 7 createMarker !="CBA_fnc_createMarker\"" !="\\fnc_createMarker" !="\"createMarker" !="cba_fCreateMarker" -7 assignItem !="axeVIP assignItem _item;" +7 assignItem !="axeVIP assignItem _item;" !="unassignItem" 7 forceAddUniform 7 removeAllMPEventHandlers 7 setDammage @@ -71,6 +71,7 @@ 7 loadFile 7 selectPlayer !="selectPlayer _playerObject;" 7 setGroupIconsVisible +7 setGroupIconsVisible 7 setGroupIconsSelectable 7 setGroupIconParams 7 addGroupIcon diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index 9b53c42e..d821bca3 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=490; +build=492; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index 9b53c42e..d821bca3 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=490; +build=492; diff --git a/Sources/epoch_server/compile/epoch_server/EPOCH_server_createMarker.sqf b/Sources/epoch_server/compile/epoch_server/EPOCH_server_createMarker.sqf new file mode 100644 index 00000000..bcafef99 --- /dev/null +++ b/Sources/epoch_server/compile/epoch_server/EPOCH_server_createMarker.sqf @@ -0,0 +1,69 @@ +/* + Author: Andrew Gregory - EpochMod.com + + Contributors: + + Description: + Create map marker for everyone, group or individual. + + ToDo: + Create delete marker(s) remoteexec function + + Parameter(s): + _this select 0: ARRAY - [Target Type 0-Player 1-Group Members 2-Multiple players 3-All players, Object(s) - Player, Group, Array of Players or markerName for option 3] + _this select 1-9: STRING(S) - Marker parameters. + + Licence: + Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike + + Github: + https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_server/EPOCH_server_createMarker.sqf +*/ +params ["_trgt","_mPos",["_mShape","ICON"],["_mType","mil_dot"],["_mText",""],["_mColor","ColorBlack"],["_mSize",[0.7,0.7]],"_mBrush","_mDir","_mAlpha",["_mrkrName",""]]; +private ["_trgtType","_trgtObj"]; +diag_log format["Epoch: ADMIN: Creating marker at %1 called by %2.", _mPos, _trgt]; +if(count _trgt < 2)exitWith{}; +_trgtType = _trgt select 0; +_trgtObj = _trgt select 1; +if(_mrkrName == "")then{_mrkrName = str(_trgtObj) + str(diag_tickTime);}; + +switch _trgtType do { + + case 0: { + if(isPlayer _trgtObj)then{ + [_trgtObj,_mPos,_mShape,_mType,_mColor,_mSize,_mBrush,_mDir,_mText,_mAlpha,_mrkrName] remoteExec ['EPOCH_fnc_createMarker',_trgtObj]; + }; + }; + + case 1: { + if!(isNull _trgtObj)then{ + { + [_x,_mPos,_mShape,_mType,_mColor,_mSize,_mBrush,_mDir,_mText,_mAlpha,_mrkrName] remoteExec ['EPOCH_fnc_createMarker',_x]; + }foreach (units group _trgtObj); + }; + }; + + case 2: { + if(isArray _trgtObj && count _trgtObj > 0)then{ + { + [_x,_mPos,_mShape,_mType,_mColor,_mSize,_mBrush,_mDir,_mText,_mAlpha,_mrkrName] remoteExec ['EPOCH_fnc_createMarker',_x]; + }foreach _trgtObj; + }; + }; + + case 3: { + if(count playableUnits > 0)then{//TODO: Test JIP, if so remove check for players, maybe. + if(_trgtObj == "")then{_trgtObj=diag_tickTime;}; + _mrkr = createMarker [_mrkrName, _mPos]; + _mrkr setMarkerShape _mShape; + _mrkr setMarkerType _mType; + if!(_mText == "")then{_mrkr setMarkerText _mText;}; + _mrkr setMarkerColor _mColor; + _mrkr setMarkerSize _mSize; + if!(isNil "_mBrush")then{_mrkr setMarkerBrush _mBrush;}; + if!(isNil "_mDir")then{_mrkr setMarkerDir _mDir;}; + if!(isNil "_mAlpha")then{_mrkr setMarkerAlpha _mAlpha;}; + }; + }; + default {diag_log format["Epoch: ADMIN: Marker failed at %1 called by %2.", _mPos, _trgt];}; +}; diff --git a/Sources/epoch_server/treeView.txt b/Sources/epoch_server/treeView.txt index 2ff0f982bd32c13b3d6f31e530e515b08affb884..2b32872ca2397cc35da85b0394f0f7bb6f6f25c8 100644 GIT binary patch delta 28 kcmbQ`{K0v{I}vtYhD3%UhV01?1)V3KV&~cXPGk)a0HYKN`Tzg` delta 12 Tcmez1Jj;2*JCV&UqHA~nDL4g( diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index 9b53c42e..d821bca3 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=490; +build=492; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index 9b53c42e..d821bca3 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=490; +build=492; diff --git a/build.txt b/build.txt index 55ddd5b2..2cb5b19e 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -490 +492