6941 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
SilentSpike	5e57cad669	Merge pull request #2216 from acemod/isolateZeusMenuKeybind ... Prevent CBA keybindings in zeus interface	2015-08-31 14:41:48 +01:00
SilentSpike	04269831e8	Consider modifier keys for zeus interaction hack ... The hacky keybind detection method should consider modifier keys also to prevent keybinds on the same key with different modifiers from firing	2015-08-31 14:40:31 +01:00
ViperMaul	0e432a5eb3	Merge pull request #2271 from jonpas/toolsCBAupdate ... Updated required CBA files	2015-08-30 21:38:13 -07:00
PabstMirror	2f54cfadbc	Merge pull request #2146 from jokoho48/codeCleanupHearing ... Code cleanup of Hearing module	2015-08-30 01:18:47 -05:00
KoffeinFlummi	6a17e3fa83	Merge remote-tracking branch 'origin/master'	2015-08-30 00:42:46 +02:00
KoffeinFlummi	5f63290508	Merge branch 'ptbr'	2015-08-30 00:42:31 +02:00
Glowbal	b968a32ea2	Merge pull request #2260 from acemod/updateMainConfig ... Update Main Config File	2015-08-30 00:37:46 +02:00
KoffeinFlummi	a7f2a7fefc	Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3	2015-08-30 00:35:11 +02:00
PabstMirror	22f8b2e8c2	Merge pull request #2305 from acemod/attachEventHandlers ... Attach event handlers	2015-08-29 16:35:51 -05:00
PabstMirror	fa3a0213b7	Merge pull request #2249 from acemod/captiveFFV ... Captive ffv animation fix + cleanup	2015-08-29 15:39:23 -05:00
Glowbal	2b3957324c	Merge pull request #2262 from jonpas/readmeFix ... Updated README.md files	2015-08-29 22:37:40 +02:00
Glowbal	998bc2d45a	Merge pull request #2297 from acemod/addMoreHearingProtection ... Add Hearing Protection to Helmets with Peltor Headsets	2015-08-29 22:34:59 +02:00
Joko	91a8463198	Merge pull request #2299 from acemod/FixTactialLadderAnimation ... Fix Tactical Ladder Animation Clipping Fixes #2287	2015-08-29 22:33:08 +02:00
SilentSpike	e3cda8ee0e	Merge pull request #2083 from acemod/spectator ... Spectator	2015-08-29 21:21:41 +01:00
SilentSpike	620136a1a7	Merge branch 'master' into spectator ... Conflicts: AUTHORS.txt	2015-08-29 21:20:04 +01:00
PabstMirror	0b3b3871ff	Merge pull request #2065 from acemod/hearingDisableZeus ... Setting to disable hearing for zeus RC	2015-08-29 15:15:14 -05:00
PabstMirror	d06680e2a0	#1571 - Handle Null Attached Objects	2015-08-29 11:47:56 -05:00
SilentSpike	200f44d963	Adjust spectator camera speed based on height ... Slows the camera movement close to the ground as it feels more natural when spectating units up close and such	2015-08-29 16:05:04 +01:00
PabstMirror	6eba898301	Merge pull request #2160 from acemod/updatingBaseClass150 ... realisticnames 1.50 Updating Base Class Changes	2015-08-29 09:55:25 -05:00
PabstMirror	f6c752045c	Cleanup	2015-08-29 09:38:57 -05:00
Glowbal	354e4410d1	Merge pull request #2268 from gienkov/pulse-enhancement ... HR and BP enhancement	2015-08-29 11:47:00 +02:00
Glowbal	70c0edf436	Merge pull request #2283 from acemod/cargoCanInteract ... Add canInteractWith checks for cargo	2015-08-29 11:45:50 +02:00
PabstMirror	007859d42e	Attach - getin/out/killed event handlers (#2200 #2300)	2015-08-28 16:57:16 -05:00
jokoho48	3269114861	Fix Tactical Ladder Animation Clipping	2015-08-28 11:55:32 +02:00
bux578	19a6226ced	add Hearing Protection to Helmets with Peltors	2015-08-28 09:10:58 +02:00
PabstMirror	80d18c468e	Merge pull request #2244 from acemod/wireCuttersConfigAndCleanup ... wirecutters config for fences + cleanup	2015-08-27 16:01:31 -05:00
commy2	6fe79c4fe2	remove obsolete compat pbo for BWMod, fix #2293	2015-08-27 22:10:09 +02:00
ViperMaul	a86ff93c16	Merge pull request #2052 from MikeMatrix/logMacros ... ACE specific logging macros	2015-08-26 21:52:20 -07:00
Michael Braun	93106697ab	Added debug log macros	2015-08-27 06:21:02 +02:00
ViperMaul	d38cb31240	Merge pull request #2109 from acemod/pushSubmaine ... Push SDV sub, cleanup push	2015-08-26 21:03:46 -07:00
ViperMaul	728aafc3c2	Merge pull request #2265 from jonpas/makeUpdate ... Updated make.py with changes from CBA	2015-08-26 21:01:21 -07:00
PabstMirror	bc016eac4c	1.50 - use new didJip command (Ref #2241)	2015-08-26 22:39:27 -05:00
jonpas	1187b73419	make.py version bump to 0.7	2015-08-27 03:23:56 +02:00
ViperMaul	5ea98143e2	Merge pull request #2211 from jonpas/integrateAsdg ... Integrated ASDG JR Optional	2015-08-26 17:53:32 -07:00
Glowbal	3db981a2c5	Merge pull request #2243 from jonpas/repairHitpointStrings ... Improved Repair Hitpoint String Localization	2015-08-26 23:32:37 +02:00
jonpas	6a6c5008c0	Merge branch 'master' into repairHitpointStrings ... Conflicts: addons/repair/functions/fnc_doRepair.sqf	2015-08-26 23:29:36 +02:00
Glowbal	f7679b45ad	Merge pull request #2246 from jonpas/repairHitpointGroups ... Repair Hitpoint Groups Framework	2015-08-26 23:27:08 +02:00
PabstMirror	9c8e9732ed	Add canInteractWith checks for cargo	2015-08-26 16:26:08 -05:00
Glowbal	a0f030c35c	Merge pull request #2282 from jonpas/fixFullRepairCondition ... Fixed Full Repair available even when vehicle is already fully repaired	2015-08-26 23:23:08 +02:00
jonpas	ce8da8d720	Fixed Full Repair available even when vehicle is already fully repaired	2015-08-26 23:09:46 +02:00
jonpas	b6d5db9157	Reverted IGNORED_HITPOINTS, Added Taru glasses to it	2015-08-26 23:09:04 +02:00
jonpas	cc70580a93	Improved comments	2015-08-26 22:51:41 +02:00
jonpas	e4123c9730	Added 2 strings, changed 1	2015-08-26 22:44:30 +02:00
jonpas	497199e5ed	Changed CBA A3 link from Armaholic to GitHub	2015-08-26 21:35:37 +02:00
jonpas	23f8bbaca1	Improved german langauge	2015-08-26 21:34:51 +02:00
jonpas	b3838262f1	Fixed duplicated part of DE readme	2015-08-26 21:33:55 +02:00
PabstMirror	ca991712e8	Merge pull request #2270 from acemod/codeCleanUpMicroDagr ... Code Cleanup MicroDagr Module	2015-08-26 11:03:22 -05:00
PabstMirror	4cf81b493a	Fix stringtable and more cleanup	2015-08-26 11:00:59 -05:00
Michael Braun	9ca19def70	Added autoformatting variations for log macros	2015-08-26 17:09:31 +02:00
jonpas	dc2e146e8b	Merge branch 'master' into repairHitpointStrings ... Conflicts: addons/repair/functions/fnc_addRepairActions.sqf	2015-08-26 17:04:05 +02:00