W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-23 16:40:50 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	CHANGE LOG 1.0.6.txt
This commit is contained in:
icomrade
2016-04-27 18:26:07 -04:00
parent 1585765ca6 244b84e74b
commit e03b5bdb37
6 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/compile/keyboard.sqf
View File

@@ -63,7 +63,7 @@ if (isNil "keyboard_keys") then {
3 call dz_fn_switchWeapon;
_handled = true;
};
_melee = {
_melee = { // Also works for rifle on back if DZE_TwoPrimaries = 2;
4 call dz_fn_switchWeapon;
_handled = true;
};