jonpas
|
7a307393a4
|
Merge branch 'master' into useQuotedPathMacros
|
2016-05-30 21:14:17 +02:00 |
|
jonpas
|
ccaec31a90
|
Use new QFUNC and QEFUNC macros
|
2016-04-08 20:43:26 +02:00 |
|
jonpas
|
85b4366368
|
Use new QPATHTOF and QPATHTOEF macros
|
2016-04-08 20:34:50 +02:00 |
|
PabstMirror
|
64de91ed06
|
Add warning for duplicate setting modules.
|
2015-10-18 23:34:11 -05:00 |
|
PabstMirror
|
9b551e3fdf
|
#1931 - Fix Explosives Module Strings
|
2015-07-28 14:42:23 -05:00 |
|
AKALegman
|
0690e6f745
|
fixed conflicts
|
2015-06-14 09:36:03 +01:00 |
|
AKALegman
|
0e375075ea
|
improved explosives v2.1
|
2015-06-06 19:04:58 +01:00 |
|
AKALegman
|
46ed9416ed
|
improved explosives v2
|
2015-06-06 18:58:42 +01:00 |
|
AKALegman
|
f9a7ab5ae0
|
improved explosives
|
2015-06-06 10:11:00 +01:00 |
|
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
|
84d940e69d
|
Fix circular dependency - ModuleDescription
|
2015-05-30 00:31:07 -05:00 |
|
esteldunedain
|
9d29aa2107
|
- Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing.
- Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it
|
2015-05-30 01:37:41 -03:00 |
|
jonpas
|
0b0f7274d7
|
Applied ESTRING and ECSTRING macros
|
2015-05-27 22:04:41 +02:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
Grzegorz Sikora
|
44466e8be8
|
Remove tabs and repair errors @Glowbal found
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
addons/optionsmenu/stringtable.xml
|
2015-05-12 18:27:27 +02:00 |
|
Grzegorz Sikora
|
156bba3321
|
Yes/No to BOOL
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/CfgVehicles.hpp
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
|
2015-05-12 18:26:24 +02:00 |
|
Grzegorz Sikora
|
6a821715a0
|
Stringtable modules
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
|
2015-05-12 18:25:40 +02:00 |
|
Garth L-H de Wet
|
9d7d71b1b1
|
Changed the tabs to 4 spaces. Hopefully.
|
2015-04-06 22:20:11 +02:00 |
|
Garth L-H de Wet
|
44c597f7c5
|
Explosives, 2 spaces to 4 space tab.
|
2015-04-06 22:10:00 +02:00 |
|
bux578
|
05896a55ea
|
fix authors
|
2015-03-24 19:40:48 +01:00 |
|
bux578
|
ba42ec831b
|
second batch of icons
|
2015-03-23 20:02:35 +01:00 |
|
Nicolás Badano
|
1d5201c0d7
|
explosives: Fix #32
|
2015-01-15 16:13:12 -03:00 |
|
Garth L-H de Wet
|
bfd9aedfa0
|
Updated pathing for script_component.hpp and updated images to use PATHTOF.
|
2015-01-12 19:11:43 +02:00 |
|
Garth L-H de Wet
|
5e67de4d66
|
Ported AGM_Explosives to ace.
Marked locations where Scheduled Delay Execution will probably need to be used.
|
2015-01-12 11:48:26 +02:00 |
|