ACE3/addons
Josuan Albin 7c9dcf6bdb Merge branch 'pr/3480'
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/cargo/stringtable.xml
	addons/flashlights/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/main/stringtable.xml
	addons/map/stringtable.xml
2016-06-18 16:26:46 +02:00
..
advanced_ballistics Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
ai Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
aircraft Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
apl Normalize leftovers 2016-06-09 14:28:31 +02:00
atragmx Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
attach Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
backpacks Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
ballistics Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
captives Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
cargo Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
common Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
concertina_wire Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
dagr Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
disarming Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
disposable Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
dragging Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
explosives Merge pull request #3815 from acemod/cbaEventSystem 2016-06-09 14:20:26 +02:00
fastroping Merge pull request #3887 from gpgpgpgp/patch-2 2016-06-11 21:53:34 +02:00
fcs Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
finger Always add finger keybind so it is changeable (#3914) 2016-06-13 12:14:35 -05:00
flashlights Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
flashsuppressors Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
fonts Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
frag Normalize leftovers 2016-06-09 14:28:31 +02:00
gestures Merge branch 'master' into huehuehue 2016-06-03 00:01:13 -05:00
gforces Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
goggles Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
grenades Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
gunbag More isModLoaded 2016-06-13 15:58:42 +02:00
hearing Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
hitreactions Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
huntir Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
interact_menu Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
interaction Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
inventory Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
javelin Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
kestrel4500 Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
laser Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
laser_selfdesignate Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
laserpointer Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
logistics_uavbattery Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
logistics_wirecutter Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
magazinerepack Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
main Fix change in behaviour of QFUNC 2016-06-17 21:44:04 +02:00
map Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
map_gestures Merge branch 'cbaEventSystem' into removeLineDrawing 2016-06-07 11:12:52 -05:00
maptools Merge branch 'pr/3480' 2016-06-18 16:26:46 +02:00
markers Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
medical Fix strange animation played when using PAK 2016-06-18 13:12:49 +02:00
medical_menu Clean up medical menu privates 2016-06-13 12:49:35 +02:00
microdagr Merge pull request #3815 from acemod/cbaEventSystem 2016-06-09 14:20:26 +02:00
minedetector exit the loop properly 2016-06-16 17:36:37 +02:00
missileguidance Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
missionmodules Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
mk6mortar Merge pull request #3815 from acemod/cbaEventSystem 2016-06-09 14:20:26 +02:00
modules Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
movement movement - Handle objNull in virtualMass 2016-06-12 02:01:49 -05:00
mx2a Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
nametags Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
nightvision Merge pull request #3815 from acemod/cbaEventSystem 2016-06-09 14:20:26 +02:00
noidle Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
noradio Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
norearm Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
optics Prepare camera when optic equipped 2016-06-12 01:53:03 -05:00
optionsmenu Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
overheating Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
overpressure Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
parachute Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
rangecard Normalize leftovers 2016-06-09 14:28:31 +02:00
realisticnames Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
rearm Merge pull request #3944 from acemod/funcHeaders 2016-06-18 11:57:43 +02:00
recoil Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
refuel Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
reload Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
reloadlaunchers Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
repair Normalize 2 more files 2016-06-09 14:25:57 +02:00
respawn Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
safemode Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
sandbag Normalize leftovers 2016-06-09 14:28:31 +02:00
scopes Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
sitting Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
slideshow Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
smallarms Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
spectator Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
spottingscope Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
switchunits Merge pull request #3815 from acemod/cbaEventSystem 2016-06-09 14:20:26 +02:00
tacticalladder Merge pull request #3815 from acemod/cbaEventSystem 2016-06-09 14:20:26 +02:00
tagging Normalize leftovers 2016-06-09 14:28:31 +02:00
thermals Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
trenches Merge pull request #3815 from acemod/cbaEventSystem 2016-06-09 14:20:26 +02:00
tripod Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
ui Fix basic UI being overwritten on RscDiary unload (#3920) 2016-06-18 11:32:56 +02:00
vector Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
vehiclelock Merge branch 'master' into eol-lf 2016-06-09 14:24:45 +02:00
vehicles Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
viewdistance Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
weaponselect Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
weather Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
winddeflection Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
yardage450 Stringtable URL (#3855) 2016-06-01 23:45:51 +02:00
zeus Merge remote-tracking branch 'origin/master' into zeusModuleUiExample 2016-06-11 21:02:16 +01:00