Merge pull request #2 from DayZMod/Development

Sync with base repo

.gitignore

@@ -8,5 +8,6 @@
 /ARMA2Tools
 /SQF/Missions/dayz_1337.chernarus/manifest
 /SQF/Missions/dayz_1337.chernarus/mfstsign
+/SQF/Missions/DayZMod.chernarus
 DayZ.bat
 *-old

SQF/Missions/dayz_1337.chernarus/init.sqf

@@ -56,20 +56,14 @@ if (isServer) then {
 };
 
 if (!isDedicated) then {
-	if (dayz_antiWallHack != 0) then {
-		//Enables Map Plug items
-		if (toLower worldName == "chernarus") then { execVM "\z\addons\dayz_code\system\mission\chernarus\antiwallhack.sqf"; };
+	if (toLower worldName == "chernarus") then {
+		if (dayz_antiWallHack == 1) then {execVM "\z\addons\dayz_code\system\mission\chernarus\antiwallhack.sqf";};
+		execVM "\z\addons\dayz_code\system\mission\chernarus\hideGlitchObjects.sqf";
 	};
 
 	//Enables Plant lib fixes
 	execVM "\z\addons\dayz_code\system\antihack.sqf";
 
-	if (toLower(worldName) == "chernarus") then {
-		diag_log "WARNING: Clearing annoying benches from Chernarus";
-		([4654,9595,0] nearestObject 145259) setDamage 1;
-		([4654,9595,0] nearestObject 145260) setDamage 1;
-	};
-
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	waitUntil {scriptDone progress_monitor};

SQF/Missions/dayz_1337.chernarus/mission.sqm

@@ -12,7 +12,8 @@ class Mission
 		"dayz_weapons",
 		"dayz_equip",
 		"cacharacters_pmc",
-		"ca_modules_functions"
+		"ca_modules_functions",
+		"zero_buildings"
 	};
 	addOnsAuto[]=
 	{

SQF/dayz_anim/CfgBanned/CfgWeapons.hpp

@@ -36,8 +36,11 @@ class CfgWeapons {
 	//class M24: FakeWeapon {};
 	//class M40A3: FakeWeapon {};
 	//class M240: FakeWeapon {};
+	class M240_Small: FakeWeapon {};
 	//class Mk_48: FakeWeapon {};
+	class Mk_48_Small: FakeWeapon {};
 	//class M249: FakeWeapon {};
+	class M249_Small: FakeWeapon {};
 	//class M4A1: FakeWeapon {};
 	//class M4A1_Aim: FakeWeapon {};
 	//class M4A1_Aim_camo: FakeWeapon {};
@@ -50,12 +53,14 @@ class CfgWeapons {
 	//class MP5SD: FakeWeapon {};
 	//class MP5A5: FakeWeapon {};
 	//class PK: FakeWeapon {};
+	class PK_Small: FakeWeapon {};
 	class Pecheneg: FakeWeapon {};
 	//class SVD: FakeWeapon {};
 	//class SVD_CAMO: FakeWeapon {};
 
 	//class Launcher: FakeWeapon {};
 	class ksvk: FakeWeapon {};
+	class ksvk_Small: FakeWeapon {};
 	class M136: FakeWeapon {};
 	class Javelin: FakeWeapon {};
 	class Stinger: FakeWeapon {};
@@ -208,12 +213,14 @@ class CfgWeapons {
 	//class AKS_74_U: FakeWeapon {};
 	//class AKS_74_UN_kobra: FakeWeapon {};
 	//class RPK_74: FakeWeapon {};
+	class RPK_74_Large: FakeWeapon {};
 	//class bizon: FakeWeapon {};
 	//class bizon_silenced: FakeWeapon {};
 	//class Colt1911: FakeWeapon {};
 	//class DMR: FakeWeapon {};
 	//class M1014: FakeWeapon {};
 	class m107: FakeWeapon {}; //old .50cal
+	class m107_Small: FakeWeapon {};
 	class M252: FakeWeapon {};
 	class 2B14: FakeWeapon {};
 	class Saiga12K: FakeWeapon {};
@@ -225,6 +232,7 @@ class CfgWeapons {
 	class m8_compact: FakeWeapon {};
 	class m8_sharpshooter: FakeWeapon {};
 	class m8_SAW: FakeWeapon {};
+	class m8_SAW_Large: FakeWeapon {};
 	//class huntingrifle: FakeWeapon {};
 	class RPG18: FakeWeapon {};
 	class SMAW: FakeWeapon {};
@@ -246,6 +254,7 @@ class CfgWeapons {
 	class CRV7_FAT: FakeWeapon {};
 	class M621: FakeWeapon {};
 	class BAF_AS50_scoped: FakeWeapon {}; //old .50cal
+	class BAF_AS50_scoped_Large: FakeWeapon {};
 	class BAF_AS50_TWS: FakeWeapon {};
 	class BAF_LRR_scoped: FakeWeapon {}; 
 	class BAF_LRR_scoped_W: FakeWeapon {};
@@ -262,6 +271,7 @@ class CfgWeapons {
 	class BAF_L86A2_ACOG: FakeWeapon {};
 	class BAF_L110A1: FakeWeapon {};
 	//class BAF_L110A1_Aim: FakeWeapon {};
+	class BAF_L110A1_Aim_Small: FakeWeapon {};
 	class BAF_L7A2_GPMG: FakeWeapon {};
 	class BAF_ied_v1: FakeWeapon {};
 	class BAF_ied_v2: FakeWeapon {};
@@ -287,10 +297,15 @@ class CfgWeapons {
 	class revolver_gold_EP1: FakeWeapon {};
 	//class glock17_EP1: FakeWeapon {};
 	//class M60A4_EP1: FakeWeapon {};
+	class M60A4_EP1_Small: FakeWeapon {};
 	//class Mk_48_DES_EP1: FakeWeapon {};
+	class Mk_48_DES_EP1_Small: FakeWeapon {};
 	//class M249_EP1: FakeWeapon {};
+	class M249_EP1_Small: FakeWeapon {};
 	class M249_TWS_EP1: FakeWeapon {};
+	class M249_TWS_EP1_Small: FakeWeapon {};
 	class M249_m145_EP1: FakeWeapon {};
+	class M249_m145_EP1_Small: FakeWeapon {};
 	//class M24_des_EP1: FakeWeapon {};
 	//class SVD_des_EP1: FakeWeapon {};
 	//class SVD_NSPU_EP1: FakeWeapon {};
@@ -318,6 +333,7 @@ class CfgWeapons {
 	class G36K: FakeWeapon {};
 	class MG36: FakeWeapon {};
 	class MG36_camo: FakeWeapon {};
+	class MG36_camo_Large: FakeWeapon {};
 	class GrenadeLauncher_EP1: FakeWeapon {};
 	class M32_EP1: FakeWeapon {};
 	class M79_EP1: FakeWeapon {};
@@ -328,6 +344,7 @@ class CfgWeapons {
 	class M110_NVG_EP1: FakeWeapon {};
 	//class M14_EP1: FakeWeapon {};
 	//class m240_scoped_EP1: FakeWeapon {};
+	class m240_scoped_EP1_Small: FakeWeapon {};
 	class M47Launcher_EP1: FakeWeapon {};
 	class MAAWS: FakeWeapon {};
 	class SCAR_Base: FakeWeapon {};
@@ -353,7 +370,9 @@ class CfgWeapons {
 	class M32_heli: FakeWeapon {};
 	class AA12_PMC: FakeWeapon {};
 	class PMC_AS50_scoped: FakeWeapon {};
+	class PMC_AS50_scoped_Large: FakeWeapon {};
 	class PMC_AS50_TWS: FakeWeapon {};
+	class PMC_AS50_TWS_Large: FakeWeapon {};
 	class m8_carbine_pmc: FakeWeapon {};
 	class m8_compact_pmc: FakeWeapon {};
 	class m8_holo_sd: FakeWeapon {};

SQF/dayz_buildings/a2_HouseV_2T2/a2_HouseV_2T2_01.rvmat

@@ -0,0 +1,171 @@
+ambient[]={1,1,1,1};
+diffuse[]={1,1,1,1};
+forcedDiffuse[]={0,0,0,0};
+emmisive[]={0,0,0,1};
+specular[]={1,1,1,1};
+specularPower=120;
+PixelShaderID="Multi";
+VertexShaderID="Multi";
+class TexGen0
+{
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class TexGen1
+{
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class TexGen2
+{
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class TexGen3
+{
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class TexGen4
+{
+	uvSource="tex1";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class TexGen5
+{
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class TexGen6
+{
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class TexGen7
+{
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage0
+{
+	texture="z\addons\dayz_buildings\textures\floor\floor_wood_07_co.tga";
+	texGen="0";
+};
+class Stage1
+{
+	texture="z\addons\dayz_buildings\textures\floor\floor_wood_06_co.tga";
+	texGen="1";
+};
+class Stage2
+{
+	texture="z\addons\dayz_buildings\textures\floor\floor_wood_05_co.tga";
+	texGen="2";
+};
+class Stage3
+{
+	texture="z\addons\dayz_buildings\textures\a2_textures\floor\uvybor_podlaha_koberec_co.tga";
+	texGen="3";
+};
+class Stage4
+{
+	texture="z\addons\dayz_buildings\textures\universal_mask.tga";
+	texGen="4";
+};
+class Stage5
+{
+	texture="z\addons\dayz_buildings\textures\floor\floor_wood_07_dt.tga";
+	texGen="5";
+};
+class Stage6
+{
+	texture="z\addons\dayz_buildings\textures\floor\floor_wood_06_dt.tga";
+	texGen="6";
+};
+class Stage7
+{
+	texture="z\addons\dayz_buildings\textures\floor\floor_wood_05_dt.tga";
+	texGen="7";
+};
+class Stage8
+{
+	texture="z\addons\dayz_buildings\textures\A2_detailmaps\roof1_soft_512_dtsmdi.tga";
+	texGen="3";
+};
+class Stage9
+{
+	texture="#(argb,8,8,3)color(0,0,0,0,MC)";
+	texGen="4";
+};
+class Stage10
+{
+	texture="#(argb,8,8,3)color(1,1,1,1,AS)";
+	texGen="4";
+};
+class Stage11
+{
+	texture="z\addons\dayz_buildings\textures\floor\floor_wood_07_nohq.tga";
+	texGen="0";
+};
+class Stage12
+{
+	texture="z\addons\dayz_buildings\textures\floor\floor_wood_06_nohq.tga";
+	texGen="1";
+};
+class Stage13
+{
+	texture="z\addons\dayz_buildings\textures\floor\floor_wood_05_nohq.tga";
+	texGen="2";
+};
+class Stage14
+{
+	texture="z\addons\dayz_buildings\textures\a2_textures\floor\uvybor_podlaha_koberec_nohq.paa";
+	texGen="3";
+};