W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-17 09:10:27 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup some merge conflicts

Browse Source
This commit is contained in:
ebaydayz
2016-03-04 14:29:49 -05:00
parent 61c64cb14a
commit 732c2fe5a0
8 changed files with 10 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,14 +7,10 @@ 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";
@@ -149,10 +145,6 @@ 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";
@@ -181,11 +173,7 @@ 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";
@@ -204,11 +192,6 @@ 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";

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

@@ -611,18 +611,6 @@ dayz_canDelete = 350; // Z, further than this distance from its "owner", will be
dayz_traps = [];
dayz_traps_active = [];
dayz_traps_trigger = [];
//Remove
if(isNil "dayz_ForcefullmoonNights") then {
dayz_ForcefullmoonNights = false; //force full moon nights.
};
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;
};
//Settings Not under dayz_settings
if(isNil "dayz_attackRange") then {
@@ -631,17 +619,6 @@ 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,
@@ -1085,11 +1062,8 @@ 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
@@ -1160,9 +1134,6 @@ if(!isDedicated) then {
DZE_SaveTime = 30;
Dayz_constructionContext = [];
<<<<<<< HEAD
Dayz_freefall = [ time, 0, 0.1 ];
=======
autoRunActive = 0;
>>>>>>> upstream/master
};