Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/release' into experimental

Browse Source 
# Conflicts:
#	Server_Install_Pack/sc/battleye/scripts.txt
This commit is contained in:
vbawol 2017-10-11 11:38:51 -05:00
parent 7d207076f6
commit 28adb8942d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Server_Install_Pack/sc/battleye/scripts.txt
View File

@ -1,5 +1,6 @@
//new2
5 "BIS_fnc_dynamictext" !="\"BIS_fnc_dynamictext\"" !="'BIS_fnc_dynamictext'"
5 loadFile
5 forceRespawn !="ForceRespawnDuration" !="reviveHandleForceRespawnAction" !="forcerespawn player;"
5 setFriend
5 setAmmo
@ -64,7 +65,6 @@
5 ctrlModelUp
5 ctrlSetDirection
5 deleteVehicleCrew !="fn_deleteVehicleCrew.sqf" !="\"BIS_fnc_deleteVehicleCrew\""
5 loadFile
5 selectPlayer !="selectPlayer _playerObject;"
5 setGroupIconsVisible
5 setGroupIconsVisible