W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-13 19:52:57 +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

32
SQF/dayz_code/init/compiles.sqf
View File

@@ -7,9 +7,14 @@ if (isServer) then {
if (!isDedicated) then {
"filmic" setToneMappingParams [0.07, 0.31, 0.23, 0.37, 0.011, 3.750, 6, 4]; setToneMapping "Filmic";
<<<<<<< HEAD
call compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_padlock.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\util\compile.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\loot\compile.sqf";
=======
call compile preprocessFileLineNumbers "\z\addons\dayz_code\util\compile.sqf";
>>>>>>> upstream/master
fn_dropItem = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_dropItem.sqf"; //fnc to drop items. _item call fn_dropItem;
BIS_Effects_Burn = compile preprocessFile "\ca\Data\ParticleEffects\SCRIPTS\destruction\burn.sqf";
@@ -133,15 +138,6 @@ if (!isDedicated) then {
if (DZE_modularBuild) then {
player_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\modular_build.sqf";
player_build_countNearby = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_countNearby.sqf";
player_build_states = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_states.sqf";
player_build_needNearby = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_needNearby.sqf";
player_build_getConfig = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_getConfig.sqf";
player_build_plotCheck = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_plotCheck.sqf";
player_build_buildReq = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_buildReq.sqf";
player_build_create = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_create.sqf";
player_build_controls = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_controls.sqf";
player_build_publish = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_publish.sqf";
snap_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\snap_build.sqf";
} else {
player_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build.sqf";
@@ -153,7 +149,10 @@ if (!isDedicated) then {
player_wearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_wearClothes.sqf";
object_pickup = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_pickup.sqf";
<<<<<<< HEAD
//player_switchWeapon = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_switchWeapon.sqf";
=======
>>>>>>> upstream/master
call compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_switchWeapon.sqf";
player_flipvehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_flipvehicle.sqf";
player_sleep = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_sleep.sqf";
@@ -182,7 +181,11 @@ if (!isDedicated) then {
horde_epeen_setText_humanity_fnc = compile preProcessFile "\z\addons\dayz_code\actions\playerstats\epeen_setText_humanity.sqf";
horde_epeen_setText_stats_fnc = compile preProcessFile "\z\addons\dayz_code\actions\playerstats\epeen_setText_stats.sqf";
horde_epeen_show_humanity_fnc = compile preProcessFile "\z\addons\dayz_code\actions\playerstats\show_humanity_fnc.sqf";
<<<<<<< HEAD
=======
>>>>>>> upstream/master
//System
player_monitor = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\player_monitor.sqf";
player_spawn_1 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\player_spawn_1.sqf";
@@ -202,6 +205,11 @@ if (!isDedicated) then {
onPreloadStarted "dayz_preloadFinished = false;";
onPreloadFinished "if (!isNil 'init_keyboard') then { [] spawn init_keyboard; }; dayz_preloadFinished = true;";
//Crafting
fn_updateCraftUI = {}; //need permission - compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_updateCraftUI.sqf";
player_craftItemGUI = {}; //need permission - compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_craftItemGUI.sqf";
player_checkRecipe = {}; //need permission - compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_checkRecipe.sqf";
// helper functions
player_addDuplicateTool = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_addDuplicateTool.sqf";
player_hasTools = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_hasTools.sqf";
@@ -519,6 +527,12 @@ if (!isDedicated) then {
player setVariable ["DZE_Surrendered", false, true];
DZE_Surrender = false;
};
autoRunOff = {
autoRunActive = 0;
terminate autoRunThread;
player playActionNow "Stop";
};
gear_ui_init = {
private["_control","_parent","_menu","_dspl","_grpPos"];

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
};