Merge pull request #536 from andgregor/master

Testing merge from master to see if I have less issues with having to rebase the commit
This commit is contained in:
vbawol
2013-09-12 08:37:03 -07:00
21 changed files with 62 additions and 111 deletions

View File

@@ -103,10 +103,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -103,10 +103,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -103,10 +103,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -103,10 +103,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -115,10 +115,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -116,10 +116,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -83,9 +83,6 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};

View File

@@ -103,10 +103,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -74,9 +74,6 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};

View File

@@ -103,10 +103,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -103,10 +103,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -103,10 +103,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -103,10 +103,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -104,10 +104,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -104,10 +104,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -103,10 +103,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -103,10 +103,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"

View File

@@ -74,9 +74,7 @@ if (!isDedicated) then {
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
//Lights - Without Generator Requirement
//[17,6,true,false,true,false,42,450,600,10,[0.27, 0.25, 0.15],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//Lights
[17,6,true,false,true,true,64,250,600,10,[0.698, 0.556, 0.419],"Generator_DZ",250,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
//With Generator Requirement
[17,6,true,false,true,true,64,250,250,10,[0.698, 0.556, 0.419],"Generator_DZ",280,"",6] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};