jonpas
|
541f1010a7
|
Merge branch 'master' into macroSTR
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
|
2015-06-02 22:14:32 +02:00 |
|
PabstMirror
|
473ab7d7c0
|
Fix mmg UBC
|
2015-05-31 23:48:20 -05:00 |
|
jonpas
|
d934c25b78
|
Merge branch 'master' into macroSTR
Conflicts:
addons/interact_menu/ACE_Settings.hpp
|
2015-05-30 19:54:32 +02:00 |
|
Josuan Albin
|
7603e71468
|
removed useless entries
|
2015-05-29 22:08:13 +02:00 |
|
Josuan Albin
|
26a9f7f38e
|
navid and SPMG barrel swapping added
- added navid class to barrel swapping config
- added SPMG class to barrel swapping config
|
2015-05-29 15:31:48 +02:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
esteldunedain
|
038c871356
|
Make overheating use bullet mass in grains introduced by ab
|
2015-04-05 20:11:42 -03:00 |
|
Nicolás Badano
|
a97b767283
|
overheating: ironing out bugs
|
2015-01-13 21:07:32 -03:00 |
|
Nicolás Badano
|
1db298722b
|
CBAfy AGM_Overheating
|
2015-01-13 00:23:14 -03:00 |
|