jonpas 9fbf256acd Merge branch 'master' into macroSTR ... Conflicts: addons/hearing/functions/fnc_putInEarplugs.sqf addons/interact_menu/ACE_Settings.hpp		2015-06-04 17:13:09 +02:00
..
advanced_ballistics	Merge branch 'master' into macroSTR	2015-06-04 17:13:09 +02:00
ai	Fixed Capitalized folders on include paths	2015-05-20 23:28:10 +02:00
aircraft	Changed all strings to macros (except external)	2015-05-27 19:04:25 +02:00
apl	Ported the ACE2 MX-2A thermal imaging device	2015-06-02 12:58:47 +02:00
atragmx	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
attach	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
backpacks	Some missing private defines.	2015-04-16 12:36:16 -05:00
ballistics	Merge branch 'master' into macroSTR	2015-06-02 22:22:51 +02:00
captives	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
common	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
difficulties
disarming	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
disposable	Applied ESTRING and ECSTRING macros	2015-05-27 22:04:41 +02:00
dragging	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
explosives	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
fcs	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
flashsuppressors	Applied ESTRING and ECSTRING macros	2015-05-27 22:04:41 +02:00
fonts	Fixed: Font config breaking checkPBO	2015-05-20 10:42:24 -07:00
frag	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
gforces	All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.	2015-05-21 09:42:44 -07:00
goggles	Merge branch 'master' into macroSTR	2015-05-30 19:54:32 +02:00
grenades	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
hearing	Merge branch 'master' into macroSTR	2015-06-04 17:13:09 +02:00
hitreactions	HitReactions - Don't do when mounted, add setting	2015-05-31 16:16:14 -05:00
interact_menu	Merge branch 'master' into macroSTR	2015-06-04 17:13:09 +02:00
interaction	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
inventory	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
javelin	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
kestrel4500	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
laser	Fixed IS_STRING error due to regex replacing it with LSTRING	2015-05-30 20:09:53 +02:00
laser_selfdesignate	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
laserpointer	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
logistics_uavbattery	Merge branch 'master' into macroSTR	2015-05-30 19:54:32 +02:00
logistics_wirecutter	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
magazinerepack	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
main	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
map	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
maptools	Stringtable fixes up to medical	2015-05-27 21:19:14 +02:00
markers	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
medical	Merge branch 'master' into macroSTR	2015-06-02 22:22:51 +02:00
microdagr	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
missileguidance	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
missionmodules	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
mk6mortar	Fixed a syntax error, Fixed nametags module order as per last pull request	2015-06-02 22:36:06 +02:00
modules	Modules - fix addEventHandler	2015-06-02 12:15:58 -05:00
movement	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
mx2a	Stringtable cleanup	2015-06-02 20:18:30 +02:00
nametags	Fixed a syntax error, Fixed nametags module order as per last pull request	2015-06-02 22:36:06 +02:00
nightvision	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
noidle	indentation	2015-03-26 18:03:13 +01:00
noradio	More Privates	2015-04-17 15:45:00 -05:00
norearm	hide rearm action for players	2015-03-26 14:14:56 +01:00
optics	Merge branch 'master' into macroSTR	2015-05-30 19:54:32 +02:00
optionsmenu	Merge branch 'master' into macroSTR	2015-06-04 17:13:09 +02:00
overheating	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
overpressure	Fixed Capitalized folders on include paths	2015-05-20 23:28:10 +02:00
parachute	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
protection	Fix 1.44 Updating Base Class	2015-05-05 10:46:56 -05:00
ragdolls	Fixed Capitalized folders on include paths	2015-05-20 23:28:10 +02:00
rangecard	Further improved error handling when AB is enabled with incomplete configs:	2015-05-30 20:06:55 +02:00
realisticnames	Removed mistakenly added quotes in realisticnames comments	2015-05-27 22:57:50 +02:00
recoil	Removed debug output	2015-04-28 19:33:00 +02:00
reload	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
reloadlaunchers	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
respawn	Merge branch 'master' into macroSTR	2015-06-04 17:13:09 +02:00
safemode	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
scopes	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
smallarms	Cleaning up of all tabs in source code files.	2015-04-06 09:22:43 -07:00
switchunits	Merge branch 'master' into macroSTR	2015-06-02 22:22:51 +02:00
testmissions	Fixed Capitalized folders on include paths	2015-05-20 23:28:10 +02:00
thermals	Fixed Capitalized folders on include paths	2015-05-20 23:28:10 +02:00
vector	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
vehiclelock	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
vehicles	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
viewdistance	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
weaponselect	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
weather	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
winddeflection	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
zeus	Added icon to unconscious module	2015-06-01 20:56:58 +01:00