SilentSpike 5b8708a179 Prevent CBA keybindings in zeus interface ... Checks if the key pressed matches the zeus menu keybind and only fires the code to handle CBA keybinds if true. Should fix the majority of weirdness with keybinds in zeus. However, not perfect as shared keybinds with different modifiers will still fire and it's really an un-ideal workaround.		2015-08-20 18:17:37 +01:00
..
advanced_ballistics	Merge branch 'release'	2015-08-04 22:29:05 +02:00
ai	Fixed Capitalized folders on include paths	2015-05-20 23:28:10 +02:00
aircraft	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
apl	Merge pull request #1493 from acemod/tacticalladder	2015-06-13 09:37:41 +02:00
atragmx	Capitalization for macro CBA_fnc_addPerFrameHandler	2015-08-04 02:34:38 -05:00
attach	Merge pull request #1977 from acemod/attachClickCooldown	2015-08-08 11:18:20 -05:00
backpacks	PATHTOF dont work with say3d	2015-08-13 21:57:58 +02:00
ballistics	Updated parameterization in Ballistics module.	2015-08-05 01:14:03 +02:00
captives	Merge pull request #2128 from acemod/gienkov-pl-translation-5	2015-08-16 08:54:47 +02:00
cargo	Moved spare parts cargo init to cargo	2015-08-19 03:36:31 +02:00
common	Merge pull request #2165 from acemod/enhanceRespawn	2015-08-16 22:05:41 +02:00
concertina_wire	Merge pull request #1977 from acemod/attachClickCooldown	2015-08-08 11:18:20 -05:00
dagr	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
difficulties
disarming	Fix count problems	2015-08-14 20:13:41 -05:00
disposable	Delete unused file	2015-08-10 15:26:44 -05:00
dragging	Merge branch 'master' into repair	2015-07-03 22:29:29 +02:00
explosives	Manual Fix #1931	2015-07-28 15:25:52 -05:00
fcs	Macroize all stringtables	2015-06-05 21:02:24 -05:00
finger	Code cleanup of Finger module is Incomming(Part 2).	2015-08-13 22:04:35 +02:00
flashsuppressors	Correcting some spacing	2015-06-24 17:09:43 +01:00
fonts	Fixed: Font config breaking checkPBO	2015-05-20 10:42:24 -07:00
frag	Capitalization for macro CBA_fnc_addPerFrameHandler	2015-08-04 02:34:38 -05:00
gforces	All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.	2015-05-21 09:42:44 -07:00
goggles	Capitalization for macro CBA_fnc_addPerFrameHandler	2015-08-04 02:34:38 -05:00
grenades	Grenade Cleanup	2015-08-14 20:25:27 -05:00
hearing	Move DoNotForce to common	2015-08-06 12:24:56 -05:00
hitreactions	Code cleanup of HitReaction module	2015-08-13 23:50:51 +02:00
huntir	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
interact_menu	Prevent CBA keybindings in zeus interface	2015-08-20 18:17:37 +01:00
interaction	Merge branch 'master' into repair	2015-08-09 00:33:08 -05:00
inventory	Merge branch 'master' into macroSTR	2015-06-02 22:14:32 +02:00
javelin	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
kestrel4500	Switch to some already translated CSTRINGs	2015-08-03 15:52:35 -05:00
laser	Merge pull request #1956 from SzwedzikPL/laser_default_keybinds	2015-08-14 19:36:02 -05:00
laser_selfdesignate	Capitalization for macro CBA_fnc_addPerFrameHandler	2015-08-04 02:34:38 -05:00
laserpointer	Merge pull request #1541 from jonpas/sitting	2015-06-26 21:34:34 +02:00
logistics_uavbattery	Code Cleanup Logistic UAV Battery.	2015-08-16 00:07:17 +02:00
logistics_wirecutter	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
magazinerepack	Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting	2015-06-13 22:08:13 +02:00
main	Updated version to 3.2.2	2015-08-04 21:36:03 -07:00
map	Merge pull request #1993 from acemod/fixMapCompassChange	2015-08-14 19:34:09 -05:00
maptools	#2033 - MapTools work on children of itemMap	2015-08-06 12:14:45 -05:00
markers	Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting	2015-06-13 22:08:13 +02:00
medical	Fix medical CPR code and log message	2015-08-19 23:30:13 +01:00
medical_menu	Return true / false if event was handled so that CBA keybinding doesn't have a reason to complain.	2015-08-19 15:32:46 -03:00
microdagr	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
missileguidance	Capitalization for macro CBA_fnc_addPerFrameHandler	2015-08-04 02:34:38 -05:00
missionmodules	Capitalization for macro CBA_fnc_addPerFrameHandler	2015-08-04 02:34:38 -05:00
mk6mortar	Mk6 - Misc cleanup	2015-07-26 16:45:34 -05:00
modules	Ace_modules - Pass synced objects to functions	2015-07-01 01:53:15 -05:00
movement	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
mx2a	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
nametags	Merge pull request #2106 from acemod/optionMenuFiltering	2015-08-14 19:31:17 -05:00
nightvision	Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting	2015-06-13 22:08:13 +02:00
noidle
noradio	Correcting some spacing	2015-06-24 17:09:43 +01:00
norearm
optics	Merge branch 'master' into macroSTR	2015-05-30 19:54:32 +02:00
optionsmenu	Merge pull request #2128 from acemod/gienkov-pl-translation-5	2015-08-16 08:54:47 +02:00
overheating	Capitalization for macro CBA_fnc_addPerFrameHandler	2015-08-04 02:34:38 -05:00
overpressure	Fixed Capitalized folders on include paths	2015-05-20 23:28:10 +02:00
parachute	Merge pull request #1974 from jokoho48/parachutePrivateScope	2015-08-08 14:25:40 +02:00
protection
ragdolls	Fixed Capitalized folders on include paths	2015-05-20 23:28:10 +02:00
rangecard	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
realisticnames	CZ - Translation	2015-06-12 14:50:50 +02:00
recoil
reload	Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting	2015-06-13 22:08:13 +02:00
reloadlaunchers	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
repair	Moved spare parts cargo init to cargo	2015-08-19 03:36:31 +02:00
respawn	fix indentation	2015-08-15 18:58:31 +02:00
safemode	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
sandbag	Merge pull request #2056 from MikeMatrix/codeCleanupSandbag	2015-08-09 23:56:25 +02:00
scopes	count should be a foreach	2015-08-09 00:41:43 +02:00
sitting	Merge pull request #2054 from MikeMatrix/codeCleanupSitting	2015-08-08 17:00:07 +02:00
slideshow	Merge branch 'master' into addMainAction	2015-08-09 13:00:56 -05:00
smallarms
spottingscope	Cleanup code of Spottingscope module	2015-08-07 11:47:23 +02:00
switchunits	Capitalization for macro CBA_fnc_addPerFrameHandler	2015-08-04 02:34:38 -05:00
tacticalladder	Fix Some LandContactPoints	2015-08-17 16:11:23 +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
tripod	Merge pull request #1977 from acemod/attachClickCooldown	2015-08-08 11:18:20 -05:00
ui
vector	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
vehiclelock	vehLock - debug trace / type checking	2015-08-07 13:24:47 -05:00
vehicles	Fixed documentation typo in Vehicles module	2015-08-05 06:02:21 +02:00
viewdistance	fixed missing semi-column	2015-08-08 17:49:43 +02:00
weaponselect	Updated function documentation of Weaponselect	2015-08-08 14:40:23 +02:00
weather	Merge pull request #1980 from MikeMatrix/headDirBasedWindIndication	2015-08-08 14:51:37 +02:00
winddeflection	Updated parameterization in Winddeflection module.	2015-08-04 23:52:16 +02:00
yardage450	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
zeus	Specify zeus setMedic module conditions further	2015-08-15 21:44:40 +01:00