W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Merge Conflict 1

Browse Source
This commit is contained in:
icomrade
2016-03-03 22:09:38 -05:00
parent bad0a2e461 479097e7a8
commit 61c64cb14a
175 changed files with 9333 additions and 7650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
SQF/dayz_code/init/variables.sqf
View File

@@ -619,6 +619,7 @@ if(isNil "dayz_bleedingeffect") then {
dayz_bleedingeffect = 3;
};//dayz_bleedingeffect = 3; //1= blood on the ground, 2= partical effect, 3 = both.
<<<<<<< HEAD
if(isNil "dayz_temperature_override") then {
dayz_temperature_override = false;
};
@@ -631,6 +632,16 @@ if(isNil "dayz_attackRange") then {
if(isNil "dayz_DamageMultiplier") then {
dayz_DamageMultiplier = 1;
=======
if(isNil "dayz_ForcefullmoonNights") then {
dayz_ForcefullmoonNights = false; //force full moon nights.
};
if(isNil "dayz_temperature_override") then {
dayz_temperature_override = false;
};
if(isNil "dayz_spawnselection") then {
dayz_spawnselection = 0;
>>>>>>> upstream/master
};
if(isNil "dayz_quickSwitch") then {
dayz_quickSwitch = false; //Enable quick weapon switch,
@@ -741,9 +752,6 @@ if (isNil "DZE_modularBuild") then {
if (isNil "DZE_snapExtraRange") then {
DZE_snapExtraRange = 0;
};
if (isNil "DZE_checkNearbyRadius") then {
DZE_checkNearbyRadius = 30;
};
if (isNil "DZE_RestrictSkins") then {
DZE_RestrictSkins = [];
};
@@ -896,9 +904,6 @@ if(isServer) then {
DZE_DYN_AntiStuck2nd = 0;
DZE_DYN_AntiStuck3rd = 0;
if(isNil "dayz_fullMoonNights") then {
dayz_fullMoonNights = false;
};
if(isNil "EpochEvents") then {
EpochEvents = [];
};
@@ -1080,7 +1085,11 @@ if(!isDedicated) then {
//if (uiNamespace getVariable ['DZ_displayUI', 0] == 2) then {
// dayzDebug = true;
//};
<<<<<<< HEAD
dayz_dodge = false;
=======
dayz_onBack = "";
>>>>>>> upstream/master
DZE_ActionInProgress = false;
// DayZ Epoch Client only variables
@@ -1151,5 +1160,9 @@ if(!isDedicated) then {
DZE_SaveTime = 30;
Dayz_constructionContext = [];
<<<<<<< HEAD
Dayz_freefall = [ time, 0, 0.1 ];
=======
autoRunActive = 0;
>>>>>>> upstream/master
};