commy2 1ec4556bb8 fix zeus forced interface broken, fix #2642		2015-09-29 02:48:22 +02:00
..
advanced_ballistics	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
ai
aircraft	Revert "disable a10 tracers, commanche tracers only nvg"	2015-09-15 21:25:01 +02:00
apl
atragmx	Merge branch 'release' into french	2015-09-10 19:36:56 +02:00
attach	Fix #2432 - Don't check for null attached when mounted	2015-09-14 18:06:46 -05:00
backpacks	Code cleanup Backpacks	2015-09-26 20:29:08 +02:00
ballistics	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
captives	Merge pull request #2509 from acemod/miscFixNilFunctions	2015-09-21 20:36:09 -05:00
cargo	Merge pull request #2614 from jonpas/loadCargoOptionalHint	2015-09-27 13:48:27 +02:00
common	manual merge	2015-09-28 21:06:40 +02:00
concertina_wire	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
dagr	Merge https://github.com/dudakov/ACE3 into russian-merge	2015-09-23 19:17:52 +02:00
difficulties
disarming	Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros	2015-09-15 14:51:23 +02:00
disposable	fix ai seemingly reloading disposable launcher at mission start, fix #2508	2015-09-18 22:25:09 +02:00
dragging	manual merge	2015-09-28 21:06:40 +02:00
explosives	rework modifier key, cleanup sandbags, tripod, ladder, fix #2590	2015-09-26 03:16:55 +02:00
fcs	add fcs to static machine guns, close #1188	2015-09-17 14:40:58 +02:00
finger	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
flashlights	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
flashsuppressors
fonts
frag	Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros	2015-09-15 14:51:23 +02:00
gforces	Cleanup more stuff	2015-09-18 14:24:20 -05:00
goggles	Replace googles - isTurnedOut	2015-09-21 15:03:34 -05:00
grenades	remove superfluous brackets	2015-09-26 22:42:47 +02:00
hearing	Merge https://github.com/dudakov/ACE3 into russian-merge	2015-09-23 19:17:52 +02:00
hitreactions	change description in function header	2015-09-26 21:27:00 +02:00
huntir	Merge pull request #2387 from acemod/FixHCPPE	2015-09-15 21:04:37 +02:00
interact_menu	Merge branch 'release'	2015-09-21 17:14:53 -05:00
interaction	manual merge	2015-09-28 21:06:40 +02:00
inventory	Merge branch 'release' into french	2015-09-10 19:36:56 +02:00
javelin	Update French translations	2015-09-10 19:14:51 +02:00
kestrel4500
laser
laser_selfdesignate
laserpointer	Merge pull request #2387 from acemod/FixHCPPE	2015-09-15 21:04:37 +02:00
logistics_uavbattery
logistics_wirecutter
magazinerepack
main	Macro for non spawned CBA Debug Logging	2015-09-25 22:30:57 -05:00
map	Merge branch 'release'	2015-09-21 17:14:53 -05:00
maptools	maptools - Remove debug	2015-09-19 20:42:46 -05:00
markers
medical	Merge pull request #2565 from acemod/medVehAssignFix	2015-09-28 15:02:48 +02:00
medical_menu	Merge pull request #2509 from acemod/miscFixNilFunctions	2015-09-21 20:36:09 -05:00
microdagr	microDagr - Add ability to access draw event for minimap	2015-09-14 16:37:39 -05:00
missileguidance	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
missionmodules	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
mk6mortar	Merge branch 'master' into miscFixNilFunctions	2015-09-21 15:08:43 -05:00
modules
movement
mx2a	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
nametags	Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros	2015-09-15 14:51:23 +02:00
nightvision	Use _player instead of ACE_player	2015-09-18 12:48:59 -05:00
noidle
noradio	Code Cleanup NoRadio	2015-09-26 20:45:19 +02:00
norearm
optics	fix zeus forced interface broken, fix #2642	2015-09-29 02:48:22 +02:00
optionsmenu	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
overheating	Merge pull request #2509 from acemod/miscFixNilFunctions	2015-09-21 20:36:09 -05:00
overpressure	Fixed incorrect handleDamage call	2015-09-19 11:52:35 +02:00
parachute	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
ragdolls
rangecard	Fix some merging errors	2015-09-10 22:11:09 +02:00
realisticnames	Russian Translations - Update	2015-09-03 04:54:52 +03:00
recoil
reload	Merge pull request #2387 from acemod/FixHCPPE	2015-09-15 21:04:37 +02:00
reloadlaunchers
repair	Merge https://github.com/dudakov/ACE3 into russian-merge	2015-09-23 19:17:52 +02:00
respawn	fix wrong macro, missing ;	2015-09-26 16:45:39 +02:00
safemode	Code Cleanup SafetyMode	2015-09-27 08:28:55 +02:00
sandbag	rework modifier key, cleanup sandbags, tripod, ladder, fix #2590	2015-09-26 03:16:55 +02:00
scopes	Cleanup more stuff	2015-09-18 14:24:20 -05:00
sitting	Merge branch 'release'	2015-09-15 16:16:10 -05:00
slideshow	Change may to must in slideshow error log	2015-09-28 16:02:18 +02:00
smallarms
spectator	fix spectator view if called instantly	2015-09-25 12:51:13 +02:00
spottingscope	better animation for spotting scope, fix #1638	2015-08-30 13:10:25 +02:00
switchunits	add english translation to switch units module	2015-09-16 23:49:34 +02:00
tacticalladder	fix error in handleplayerchanged for tacticl ladder	2015-09-28 21:16:13 +02: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
vehiclelock	"cherrypick" PR #2496 (lockpick)	2015-09-19 10:02:37 -05:00
vehicles	Merge pull request #2387 from acemod/FixHCPPE	2015-09-15 21:04:37 +02:00
viewdistance	Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros	2015-09-15 14:51:23 +02:00
weaponselect	remove obsolete functions	2015-09-27 17:15:59 +02:00
weather	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
winddeflection	Merge pull request #2387 from acemod/FixHCPPE	2015-09-15 21:04:37 +02:00
yardage450	Russian Translations - Update	2015-09-03 04:54:52 +03:00
zeus	Merge https://github.com/dudakov/ACE3 into russian-merge	2015-09-23 19:17:52 +02:00