mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-16 05:39:58 +03:00
Merge pull request #568 from vbawol/Skaro3
Remove Benches at NWAF and disable the action keys (f1-f12 + 0-9)
This commit is contained in:
11
README.md
11
README.md
@@ -8,8 +8,7 @@ http://dayzepoch.com
|
||||
|
||||
Based on DayZ Mod Community edition
|
||||
|
||||
https://github.com/R4Z0R49/DayZMod/blob/Release_1.7.6/Documentation/Credits.md
|
||||
|
||||
https://github.com/DayZMod/DayZ/blob/Release_1.8/Documentation/Credits.md
|
||||
http://dayzmod.com
|
||||
|
||||
--------------------------
|
||||
@@ -25,7 +24,7 @@ Included Custom Addons
|
||||
* MAP Editorupgrade (EU) http://www.armaholic.com/page.php?id=6194
|
||||
* st_movement by ShackTac https://dev-heaven.net/projects/shacktac/files
|
||||
* st_bunnyhop by ShackTac https://dev-heaven.net/projects/shacktac/files
|
||||
* Jetski Yanahui by Kol9yN, Zakat, Gerasimow9, YuraPetrov, zGuba, A.Karagod, IceBreakr, Sahbazz
|
||||
* Jetski Yanahui by Kol9yN, Zakat, Gerasimow9, YuraPetrov, zGuba, A.Karagod, IceBreakr and Sahbazz http://www.armaholic.com/page.php?id=13053
|
||||
|
||||
--------------------------
|
||||
Developers
|
||||
@@ -42,8 +41,8 @@ Special thanks
|
||||
--------------------------
|
||||
* BIS for a incredible and versatile game and engine. http://www.bistudio.com/
|
||||
* Rocket - DAYZ! http://dayzmod.com | http://dayzgame.com
|
||||
* DayZ Community Developers - https://github.com/R4Z0R49/DayZMod - https://github.com/DayZMod
|
||||
* ziellos2k - Tag Friendly code. https://github.com/R4Z0R49/DayZMod/pull/232
|
||||
* DayZ Community Developers - https://github.com/DayZMod
|
||||
* ziellos2k - Tag Friendly code. https://github.com/ziellos2k
|
||||
* Dayz Hive DLL - https://github.com/rajkosto/hive
|
||||
* Munchiefest - Beta Tester, Wiki Editor, Ideas - http://www.twitch.tv/munchiefest
|
||||
* aeinstein - Crafting now supports all can types. - https://github.com/aeinstein
|
||||
@@ -51,4 +50,4 @@ Special thanks
|
||||
* OrangeSherbet - Beta Tester - http://www.twitch.tv/orangesherbet
|
||||
* QMGSaint - Beta Tester - http://www.twitch.tv/qmgsaint
|
||||
* Twitch.tv Streamers http://www.twitch.tv/directory/game/DayZ
|
||||
* Thanks to all the other beta testers, you know who you are!--
|
||||
* Thanks to all the other beta testers, you know who you are!-
|
||||
@@ -261,6 +261,10 @@ if (!isDedicated) then {
|
||||
private ["_dikCode", "_handled"];
|
||||
_dikCode = _this select 1;
|
||||
|
||||
if (_dikCode in[0x58,0x57,0x44,0x43,0x42,0x41,0x40,0x3F,0x3E,0x3D,0x3C,0x3B,0x0B,0x0A,0x09,0x08,0x07,0x06,0x05]) then {
|
||||
_handled = true;
|
||||
};
|
||||
|
||||
if (_dikCode in actionKeys "MoveForward") exitWith {r_interrupt = true};
|
||||
if (_dikCode in actionKeys "MoveLeft") exitWith {r_interrupt = true};
|
||||
if (_dikCode in actionKeys "MoveRight") exitWith {r_interrupt = true};
|
||||
@@ -292,10 +296,9 @@ if (!isDedicated) then {
|
||||
};
|
||||
//if (_dikCode == 57) then {_handled = true}; // space
|
||||
//if (_dikCode in actionKeys 'MoveForward' or _dikCode in actionKeys 'MoveBack') then {r_interrupt = true};
|
||||
if (_dikCode == 210) then //SCROLL LOCK
|
||||
{
|
||||
if (_dikCode == 210) then {
|
||||
_nill = execvm "\z\addons\dayz_code\actions\playerstats.sqf";
|
||||
};
|
||||
};
|
||||
|
||||
if (_dikCode in actionKeys "ForceCommandingMode") then {_handled = true};
|
||||
if (_dikCode in actionKeys "PushToTalk" and (time - dayz_lastCheckBit > 10)) then {
|
||||
|
||||
@@ -136,5 +136,8 @@ if (_hiveVer >= dayz_hiveVersionNo) then {
|
||||
_isHiveOk = true;
|
||||
};
|
||||
|
||||
([4654,9595,0] nearestObject 145259) setDamage 1;
|
||||
([4654,9595,0] nearestObject 145260) setDamage 1;
|
||||
|
||||
dayzPlayerLogin = [_charID,_inventory,_backpack,_survival,_isNew,dayz_versionNo,_model,_isHiveOk,_newPlayer,_isInfected];
|
||||
(owner _playerObj) publicVariableClient "dayzPlayerLogin";
|
||||
Reference in New Issue
Block a user