ACE3/addons
jonpas d934c25b78 Merge branch 'master' into macroSTR
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
..
advanced_ballistics Merge branch 'master' into macroSTR 2015-05-30 19:54:32 +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 Added author 2015-05-01 20:16:34 +02:00
atragmx Merge branch 'master' into macroSTR 2015-05-30 19:54:32 +02:00
attach Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
backpacks Some missing private defines. 2015-04-16 12:36:16 -05:00
ballistics Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
captives Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
common Merge branch 'master' into macroSTR 2015-05-30 19:54:32 +02:00
difficulties
disarming Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
disposable Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
dragging Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
explosives Merge branch 'master' into macroSTR 2015-05-30 19:54:32 +02:00
fcs Macro STRING to LSTRING 2015-05-28 21:59:04 +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 Stringtable fixes up to medical 2015-05-27 21:19:14 +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 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
hitreactions
interact_menu Merge branch 'master' into macroSTR 2015-05-30 19:54:32 +02:00
interaction Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
inventory Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
javelin Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
kestrel4500 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
laser Macro STRING to LSTRING 2015-05-28 21:59:04 +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 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
main Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
map Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +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-05-30 19:54:32 +02:00
microdagr Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
missileguidance Stringtable fixes except medical 2015-05-27 21:43:30 +02:00
missionmodules Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
mk6mortar Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
modules Transfered ballistics support (as discussed with glowbal) 2015-05-11 14:45:37 +01:00
movement Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
nametags Merge branch 'master' into macroSTR 2015-05-30 19:54:32 +02:00
nightvision Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
noidle
noradio More Privates 2015-04-17 15:45:00 -05:00
norearm
optics Merge branch 'master' into macroSTR 2015-05-30 19:54:32 +02:00
optionsmenu Merge branch 'master' into macroSTR 2015-05-30 19:54:32 +02:00
overheating Merge branch 'master' into macroSTR 2015-05-30 19:54: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 Removed some unneeded code 2015-05-29 20:51:20 +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 Macro STRING to LSTRING 2015-05-28 21:59:04 +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
switchunits Macro STRING to LSTRING 2015-05-28 21:59:04 +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 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
vehicles Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
viewdistance Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
weaponselect Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
weather Merge branch 'master' into macroSTR 2015-05-30 19:54:32 +02:00
winddeflection Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
zeus All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00