ebaydayz 732c2fe5a0 Cleanup some merge conflicts

2016-03-04 14:29:49 -05:00

..

CfgConstruction

CFG WEAPONS DONE

2016-02-21 13:09:16 -05:00

CfgCrafting

Add journal and preliminary strings for crafting

2016-03-03 20:11:11 -05:00

CfgExtra

minor range adjustments

2014-08-09 14:21:21 +01:00

CfgGrid

CFG WEAPONS DONE

2016-02-21 13:09:16 -05:00

CfgLoot

CFGLoot should be done

2016-02-26 11:24:20 -05:00

CfgMagazines

Ammo still, and needs to implement weapon groups

2016-02-24 10:02:15 -05:00

CfgObjectCompositions

CFG WEAPONS DONE

2016-02-21 13:09:16 -05:00

CfgPlayerStats

Cleanup some merge conflicts

2016-03-04 14:29:49 -05:00

CfgTownGenerator

CFG WEAPONS DONE

2016-02-21 13:09:16 -05:00

CfgVehicles

Missing Files

2016-02-29 00:55:29 -05:00

CfgWeapons

CFGLoot should be done

2016-02-26 11:24:20 -05:00

CfgWorlds

CFG WEAPONS DONE

2016-02-21 13:09:16 -05:00

RscDisplay

Fix Merge Conflict 1

2016-03-03 22:09:38 -05:00

basicDefines.hpp

CFG WEAPONS DONE

2016-02-21 13:09:16 -05:00

cfgAmmo.hpp

CfgAmmo Update

2016-02-22 10:58:33 -05:00

CfgArma.hpp

Some compiles, start separation of blood system

2016-02-27 09:56:53 -05:00

cfgFaces.hpp

Fix a bunch of errors

2016-02-21 13:13:00 -05:00

CfgGlasses.hpp

Define Overwatch Gasmask as empty class

2013-09-20 13:49:41 +02:00

CfgMarkers.hpp

CfgVehicles and Scope issues done

2016-02-21 13:14:03 -05:00

cfgMoves.hpp

moved some configs added new zeds from 177 pt1

2013-08-01 11:46:00 -05:00

CfgNonAIVehicles.hpp

Update CfgNonAIVehicles.hpp

2013-09-14 03:38:28 +01:00

CfgObjectCompositions.hpp

CFG WEAPONS DONE

2016-02-21 13:09:16 -05:00

CfgRecoils.hpp

CFG WEAPONS DONE

2016-02-21 13:09:16 -05:00

CfgWorlds.hpp

cfg fix

2016-02-22 00:09:44 -05:00

rscTitles.hpp

CFG WEAPONS DONE

2016-02-21 13:09:16 -05:00