PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
PabstMirror
4cf81b493a
Fix stringtable and more cleanup
2015-08-26 11:00:59 -05:00
jonpas
29ce8f635e
Merge branch 'master' into sitting
...
Conflicts:
addons/kestrel4500/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
2015-06-13 21:43:42 +02:00
jonpas
332afb2174
Allow certain self-interactions while sitting
2015-06-09 16:17:05 +02:00
PabstMirror
560609fbed
Cleanup
2015-06-05 19:46:19 -05:00
PabstMirror
470492759c
Merge branch 'master' into multipleDevices
...
Conflicts:
addons/atragmx/initKeybinds.sqf
addons/common/XEH_postInit.sqf
addons/kestrel4500/CfgVehicles.hpp
addons/kestrel4500/initKeybinds.sqf
addons/microdagr/CfgVehicles.hpp
addons/microdagr/XEH_clientInit.sqf
2015-06-05 17:50:04 -05: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
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
PabstMirror
64a401ee8c
#1241 closed - Add Editor placeable item
2015-05-20 17:17:10 +02:00
PabstMirror
fd8d68c451
Merge branch 'master' into multipleDevices
...
Conflicts:
addons/common/stringtable.xml
2015-05-14 15:38:13 -05:00
Grzegorz Sikora
6a821715a0
Stringtable modules
...
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
PabstMirror
ffce1f6386
Condense mDagr interactions - intergrate kestral
2015-05-11 21:49:13 -05:00
PabstMirror
6ec0859f85
MicroDAGR - Allow use in vehicles
...
Can't show minimap display in turret view (cameraView = "gunner"), but
can bring up the interactive dialog
2015-04-04 14:35:24 -05:00
PabstMirror
600c7aed97
Restore Interaction Icon
2015-03-25 08:57:44 -05:00
bux578
c44b944044
add missing icons
2015-03-25 06:32:08 +01:00
bux578
074bf4ba6d
tab to space
2015-03-25 06:06:04 +01:00
bux578
4fecc1372f
add microDAGR to ace misc box
2015-03-25 06:05:06 +01:00
PabstMirror
3ab033065f
#233 - Clean up mDAGR interaction menu
...
Adds exception to use on map (also for base ACE_equipment)
selfInteract has 3 options [close, show minimap, show dialog] (only 2
possible shown at any time)
Keybinds are just toggle and close
2015-03-24 03:50:06 -05:00
PabstMirror
cd6a567ba3
Fix Icon
2015-03-18 13:50:27 -05:00
PabstMirror
396359ba67
Self Actions To Open (under equipment)
2015-03-18 13:46:39 -05:00
PabstMirror
1d6cfbf6b7
Various Changes
2015-03-09 13:52:15 -05:00
