Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove github lines

Browse Source
This commit is contained in:
DESKTOP-UH65DCE\MusTanG 2017-10-25 15:28:21 -05:00
parent 78352726bd
commit 93bdf4500a
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/epoch_config/Configs/CfgBaseBuilding.hpp
View File

@ -286,19 +286,12 @@ class CfgBaseBuilding
}; };
class WoodHalfFloor_SIM_EPOCH : WoodHalfFloor_EPOCH class WoodHalfFloor_SIM_EPOCH : WoodHalfFloor_EPOCH
{ {
<<<<<<< HEAD
allowedSnapPoints[] = {"NF","SF","EF","WF","NHW","SHW","EHW","WHW"}; allowedSnapPoints[] = {"NF","SF","EF","WF","NHW","SHW","EHW","WHW"};
=======
allowedSnapPoints[] = {"NF","SF","EF","WF","NQF","SQF","EQF","WQF","C"};
>>>>>>> origin/experimental
allowedSnapObjects[] = {"Const_floors_static_F"}; allowedSnapObjects[] = {"Const_floors_static_F"};
upgradeBuilding[] = {}; upgradeBuilding[] = {};
removeParts[] = {}; removeParts[] = {};
}; };
class WoodHalfFloor_Ghost_EPOCH : WoodHalfFloor_SIM_EPOCH {}; class WoodHalfFloor_Ghost_EPOCH : WoodHalfFloor_SIM_EPOCH {};
<<<<<<< HEAD
class MetalFloor_EPOCH : WoodFloor_EPOCH
=======
class WoodQuarterFloor_EPOCH : Default class WoodQuarterFloor_EPOCH : Default
{ {
upgradeBuilding[] = {{"MetalQuarterFloor_EPOCH",{{"ItemCorrugatedLg",1}}}}; upgradeBuilding[] = {{"MetalQuarterFloor_EPOCH",{{"ItemCorrugatedLg",1}}}};
@ -342,7 +335,6 @@ class CfgBaseBuilding
}; };
class WoodQuarterFloor_Ghost_EPOCH : WoodQuarterFloor_SIM_EPOCH {}; class WoodQuarterFloor_Ghost_EPOCH : WoodQuarterFloor_SIM_EPOCH {};
class MetalFloor_EPOCH : Default class MetalFloor_EPOCH : Default
>>>>>>> origin/experimental
{ {
upgradeBuilding[] = {{"CinderFloor_EPOCH",{{"CinderBlocks",3},{"MortarBucket",3}}}}; upgradeBuilding[] = {{"CinderFloor_EPOCH",{{"CinderBlocks",3},{"MortarBucket",3}}}};
removeParts[] = {{"ItemCorrugatedLg",1},{"ItemCorrugated",1}}; removeParts[] = {{"ItemCorrugatedLg",1},{"ItemCorrugated",1}};
@ -364,11 +356,7 @@ class CfgBaseBuilding
}; };
class MetalHalfFloor_SIM_EPOCH : MetalHalfFloor_EPOCH class MetalHalfFloor_SIM_EPOCH : MetalHalfFloor_EPOCH
{ {
<<<<<<< HEAD
allowedSnapPoints[] = {"NF","SF","EF","WF","NHW","SHW","EHW","WHW"}; allowedSnapPoints[] = {"NF","SF","EF","WF","NHW","SHW","EHW","WHW"};
=======
allowedSnapPoints[] = {"NF","SF","EF","WF","NQF","SQF","EQF","WQF","C"};
>>>>>>> origin/experimental
allowedSnapObjects[] = {"Const_floors_static_F"}; allowedSnapObjects[] = {"Const_floors_static_F"};
upgradeBuilding[] = {}; upgradeBuilding[] = {};
removeParts[] = {}; removeParts[] = {};
@ -385,11 +373,7 @@ class CfgBaseBuilding
}; };
class MetalQuarterFloor_SIM_EPOCH : MetalQuarterFloor_EPOCH class MetalQuarterFloor_SIM_EPOCH : MetalQuarterFloor_EPOCH
{ {
<<<<<<< HEAD
allowedSnapPoints[] = {"NHW","SHW","EHW","WHW","NQ1","NQ2","SQ1","SQ2","EQ1","EQ2","WQ1","WQ2"}; allowedSnapPoints[] = {"NHW","SHW","EHW","WHW","NQ1","NQ2","SQ1","SQ2","EQ1","EQ2","WQ1","WQ2"};
=======
allowedSnapPoints[] = {"NQF","SQF","EQF","WQF","C"};
>>>>>>> origin/experimental
allowedSnapObjects[] = {"Const_floors_static_F"}; allowedSnapObjects[] = {"Const_floors_static_F"};
upgradeBuilding[] = {}; upgradeBuilding[] = {};
removeParts[] = {}; removeParts[] = {};