Commit Graph

18 Commits

Author SHA1 Message Date
jonpas
3206e3b537 Fixed a syntax error, Fixed nametags module order as per last pull request 2015-06-02 22:36:06 +02: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
Grzegorz Sikora
6a821715a0 Stringtable modules
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
Grzegorz
c9cf1d2455 Update CfgVehicles.hpp
another typo few lines below
2015-05-02 01:26:54 +02:00
Grzegorz
5b9e6de6f1 Update CfgVehicles.hpp
missing "s"
2015-05-02 01:21:49 +02:00
PabstMirror
656fa8868a Module Icons 2015-04-07 19:37:46 -05:00
PabstMirror
d295ee6980 Localization / Headers 2015-04-06 01:05:28 -05:00
PabstMirror
2ada87e3ac Rangetable Item 2015-04-05 18:05:23 -05:00
PabstMirror
61a0ae1aec Rangetable Dialog 2015-04-05 15:48:56 -05:00
PabstMirror
3d9da5f142 Make Mils Toogle Self Action 2015-04-05 15:00:59 -05:00
PabstMirror
34a86e0db3 Fix Heading Mils 2015-04-05 14:48:26 -05:00
PabstMirror
0281897a3d Show Charge - Cleanup Settings 2015-04-05 14:34:39 -05:00
PabstMirror
e71378f9b3 AirResit Module Setting / Charge Display ctrl 2015-04-05 12:40:48 -05:00
PabstMirror
dab4822876 Settings / Module 2015-04-05 02:18:51 -05:00
PabstMirror
e6c7758d3f Prototype - Show Mils on mk6 2015-04-05 01:57:24 -05:00