308 Commits

Author	SHA1	Message	Date
gienkov	3250245587	3.4.0 translations and fixes	2015-11-27 21:50:57 +01:00
PabstMirror	4aeeefdfe8	Fix UBC and increase Heli_04 Pod interaction distance	2015-11-26 11:47:25 -06:00
Thomas Kooi	15267c0433	Merge pull request #2219 from acemod/handSignals ... Hand signals enhancement	2015-11-26 16:04:41 +01:00
PabstMirror	0b9044e3c7	Merge pull request #2753 from acemod/showHudSetter ... Showhud setter	2015-11-25 11:16:21 -06:00
PabstMirror	185cae2fe5	Remove Old Gestures from interaction	2015-11-25 11:00:45 -06:00
Thomas Kooi	08c5374a99	Merge pull request #2390 from BaerMitUmlaut/pass-magazine ... Added interaction to quickly pass a magazine	2015-11-25 14:04:07 +01:00
PabstMirror	36bf2d9cb5	Merge pull request #2803 from BaerMitUmlaut/remove-team-synching ... Remove manual team synching	2015-11-24 21:37:50 -06:00
BaerMitUmlaut	818466d296	Added ACE setting to hide interaction	2015-11-24 19:07:17 +01:00
PabstMirror	51a463de24	Fix tap shoulder msg display ... Missing efunc on displayTextStructured Calculate a shoulder side when using keybind	2015-11-24 11:25:56 -06:00
PabstMirror	c4117e1283	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-20 14:37:23 -06:00
SilentSpike	0110ada1b5	Fix zeus waypoint formation actions	2015-11-18 14:54:17 +00:00
PabstMirror	5823749f0c	Merge branch 'master' into settingsErrorChecking	2015-11-17 14:00:22 -06:00
commy2	a57d1bca75	replace local keyword with private	2015-11-17 17:43:07 +01:00
PabstMirror	c91789f3c4	Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking	2015-11-06 20:30:12 -06:00
PabstMirror	38105136fa	#2820 - Fix target event error	2015-11-04 17:43:51 -06:00
BaerMitUmlaut	8f473b4a27	Removed all assignTeam occurrences	2015-10-30 16:50:13 +01:00
PabstMirror	64de91ed06	Add warning for duplicate setting modules.	2015-10-18 23:34:11 -05:00
PabstMirror	94e3cd1f79	Replace old use of showHud	2015-10-15 22:45:35 -05:00
BaerMitUmlaut	1effe61aa9	Removed parent condition	2015-10-06 19:09:51 +02:00
BaerMitUmlaut	090384c014	Fixed canPassMagazine header	2015-10-06 17:56:32 +02:00
BaerMitUmlaut	d6dcd4112e	Resolved merge conflicts	2015-10-06 17:50:55 +02:00
commy2	bc8cefa5e7	manual merge	2015-09-28 21:06:40 +02:00
commy2	6c968d8bc7	per frame handler for incremental door opening	2015-09-28 20:07:01 +02:00
commy2	443cbf8be3	fix compile error when trying to open a locked door by shortcut	2015-09-28 19:03:37 +02:00
commy2	6f64fcd0fb	search for door in geometry lod (lineintersectssurface)	2015-09-28 18:45:10 +02:00
commy2	5a3a32f236	more interaction cleanup	2015-09-28 18:06:25 +02:00
commy2	9bf7b68d76	fix errors on game start	2015-09-28 17:28:51 +02:00
commy2	5c5a65443b	more interaction cleanup	2015-09-28 17:20:56 +02:00
commy2	f48636e633	more interaction cleanup, remove dead code	2015-09-28 17:11:53 +02:00
commy2	9189148b3f	more interaction cleanup	2015-09-28 15:37:18 +02:00
commy2	4b536425b1	Code Cleanup Interaction	2015-09-28 14:36:51 +02:00
commy2	2fe142032e	rework modifier key, cleanup sandbags, tripod, ladder, fix #2590	2015-09-26 03:16:55 +02:00
KoffeinFlummi	067b08611e	Fix missing newlines	2015-09-17 12:54:26 +02:00
gienkov	e2f9b31fb2	small fix + repair translation	2015-09-16 11:53:05 +02:00
Glowbal	478b618e4b	Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros ... Feature/switch to log macros	2015-09-15 14:51:23 +02:00
BaerMitUmlaut	8ee1136758	Rewrite canPassMagazine condition	2015-09-11 23:52:00 +02:00
BaerMitUmlaut	ccf1bf1de7	Cleaned up canPassMagazine condition	2015-09-11 18:24:46 +02:00
BaerMitUmlaut	a29902ddb3	More use of params, event system, removed compile	2015-09-11 15:36:23 +02:00
BaerMitUmlaut	45bfa3eaf5	Fixed vanishing mags and localized hint	2015-09-10 22:23:37 +02:00
KoffeinFlummi	c2ffe7cad0	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
KoffeinFlummi	83aa2cc68c	Merge branch 'release' into french	2015-09-10 19:36:56 +02:00
FreeZbe	fa7943c8be	Update French translations	2015-09-10 19:14:51 +02:00
BaerMitUmlaut	c26107bc5c	Added ability to pass a magazine	2015-09-08 14:07:16 +02:00
kaban	08b7110e58	Russian Translations - Update	2015-09-03 04:54:52 +03:00
kaban	91cae690c0	Russian Translations - Update	2015-09-03 03:36:15 +03:00
Michael Braun	035b3432c5	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/common/XEH_postInit.sqf	2015-09-01 08:45:59 +02:00
commy2	e7d9e8c0dc	Merge pull request #2312 from acemod/322opendoor3rdperson ... increase reach in 3rd person for opening doors, fix #2301	2015-08-31 21:32:34 +02:00
commy2	7a4c37c085	disable all actions on ladders by default, close #2289	2015-08-30 22:03:45 +02:00
commy2	4682235d8a	increase reach in 3rd person for opening doors, fix #2301	2015-08-30 11:13:26 +02:00
KoffeinFlummi	5f63290508	Merge branch 'ptbr'	2015-08-30 00:42:31 +02:00