SzwedzikPL d0c7b0035e Merge branch 'master' of https://github.com/acemod/ACE3		2015-12-02 15:24:39 +01:00
..
advanced_ballistics	manual merge	2015-11-30 17:44:15 +01:00
ai
aircraft	Revert "disable a10 tracers, commanche tracers only nvg"	2015-09-15 21:25:01 +02:00
apl
atragmx	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
attach	fix Cfg capitalization	2015-11-30 17:09:26 +01:00
backpacks	1.54 - Replace typeName with isEqualType	2015-11-20 11:40:31 -06:00
ballistics	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
captives	manual merge	2015-11-30 17:44:15 +01:00
cargo	manual merge	2015-11-30 17:44:15 +01:00
common	revert false captitalization change	2015-11-30 17:56:25 +01:00
concertina_wire	fix forEach capitalization	2015-11-30 17:23:48 +01:00
dagr	fix exitWith capitalization	2015-11-30 17:14:05 +01:00
difficulties
disarming	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
disposable	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
dragging	manual merge	2015-11-30 17:44:15 +01:00
explosives	fix more setVariable and getVariable capitalization	2015-11-30 17:53:57 +01:00
fcs	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
finger	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
flashlights	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
flashsuppressors
fonts
frag	manual merge	2015-11-30 17:44:15 +01:00
gestures	fix missing PBOPREFIX	2015-11-26 20:53:14 +01:00
gforces	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
goggles	Fix UBC for 1.54	2015-11-20 23:27:29 -06:00
grenades	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
hearing	manual merge	2015-11-30 17:44:15 +01:00
hitreactions	change description in function header	2015-09-26 21:27:00 +02:00
huntir	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
interact_menu	manual merge	2015-11-30 17:44:15 +01:00
interaction	Merge pull request #2825 from gienkov/pl-translation	2015-11-29 07:35:04 +01:00
inventory	Inventory Resize UI - changes for 154 GL-Mags	2015-11-19 15:54:43 -06:00
javelin	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
kestrel4500	fix forEachIndex capitalization	2015-11-30 17:25:16 +01:00
laser	manual merge	2015-11-30 17:44:15 +01:00
laser_selfdesignate	#2349 - Don't disable locking for base RocketPods	2015-09-14 22:11:12 -05:00
laserpointer	cleanup laserpointer	2015-11-23 20:52:04 +01:00
logistics_uavbattery
logistics_wirecutter	fix typeOf capitalization	2015-11-30 17:19:57 +01:00
magazinerepack	fix configFile capitalization	2015-11-30 17:23:02 +01:00
main	Bump version to 3.4.0	2015-12-01 17:05:08 +01:00
map	#2872-Map time support for subclasses of ItemWatch	2015-11-24 16:17:06 -06:00
map_gestures	Revert "fix Cfg capitalization"	2015-11-30 17:00:32 +01:00
maptools	maptools - Remove debug	2015-09-19 20:42:46 -05:00
markers	manual merge	2015-11-30 17:44:15 +01:00
medical	fix more setVariable and getVariable capitalization	2015-11-30 17:53:57 +01:00
medical_menu	manual merge	2015-11-30 17:44:15 +01:00
microdagr	manual merge	2015-11-30 17:44:15 +01:00
missileguidance	manual merge	2015-11-30 17:44:15 +01:00
missionmodules	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
mk6mortar	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
modules	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
movement	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
mx2a	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
nametags	manual merge	2015-11-30 17:44:15 +01:00
nightvision	manual merge	2015-11-30 17:44:15 +01:00
noidle
noradio	Code Cleanup NoRadio	2015-09-26 20:45:19 +02:00
norearm
optics	fix waitUntil capitalization	2015-11-30 17:28:01 +01:00
optionsmenu	manual merge	2015-11-30 17:44:15 +01:00
overheating	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
overpressure	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
parachute	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
ragdolls
rangecard	Fix some merging errors	2015-09-10 22:11:09 +02:00
realisticnames	RealisticNames - add ka-60 v2 (black and white)	2015-11-07 18:34:46 -06:00
rearm	fixes	2015-11-27 21:55:05 +01:00
recoil
refuel	refuel translation fixes	2015-11-28 13:45:59 +01:00
reload	manual merge	2015-11-30 17:44:15 +01:00
reloadlaunchers	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
repair	Merge branch 'master' of https://github.com/acemod/ACE3	2015-12-02 15:24:39 +01:00
respawn	fix configFile capitalization	2015-11-30 17:23:02 +01:00
safemode	manual merge	2015-11-30 17:44:15 +01:00
sandbag	fix configFile capitalization	2015-11-30 17:23:02 +01:00
scopes	fix forEachIndex capitalization	2015-11-30 17:25:16 +01:00
sitting	Add warning for duplicate setting modules.	2015-10-18 23:34:11 -05:00
slideshow	Merge pull request #2257 from jonpas/parseList	2015-10-18 12:14:18 +02:00
smallarms
spectator	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
spottingscope	Cleanup spotting scope configs	2015-11-24 15:24:14 -06:00
switchunits	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
tacticalladder	Russian Translations - Update	2015-11-05 03:28:53 +03:00
testmissions
thermals
tripod	rework modifier key, cleanup sandbags, tripod, ladder, fix #2590	2015-09-26 03:16:55 +02:00
ui	Removed copy/pasted maintainer intruder	2015-09-22 18:04:27 +02:00
vector	Fix missing boolean inversion	2015-11-28 13:58:56 +00:00
vehiclelock	Merge branch 'master' into isEqualTypeRepalcement	2015-11-27 21:08:21 -06:00
vehicles	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
viewdistance	Merge pull request #2133 from jonpas/dynamicViewDistance	2015-11-28 20:40:29 +01:00
weaponselect	fix configFile capitalization	2015-11-30 17:23:02 +01:00
weather	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
winddeflection	manual merge	2015-11-30 17:44:15 +01:00
yardage450
zeus	manual merge	2015-11-30 17:44:15 +01:00