290 Commits

Author	SHA1	Message	Date
commy2	e5c4d35969	1.55 use new selectRandom command	2015-11-29 16:33:25 +01: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
PabstMirror	64de91ed06	Add warning for duplicate setting modules.	2015-10-18 23:34:11 -05: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
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
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
KoffeinFlummi	a7f2a7fefc	Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3	2015-08-30 00:35:11 +02:00
Michael Braun	657157d767	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/hearing/functions/fnc_moduleHearing.sqf	2015-08-29 22:38:26 +02:00
ViperMaul	d38cb31240	Merge pull request #2109 from acemod/pushSubmaine ... Push SDV sub, cleanup push	2015-08-26 21:03:46 -07:00
Michael Braun	9e10aa86d7	Standardize logging format through ACE_LOG macros	2015-08-26 15:32:54 +02:00
gienkov	cf585790db	fixes done	2015-08-22 11:41:15 +02:00
jonpas	de033f0ff2	README.md files added to all modules	2015-08-19 04:18:33 +02:00
PabstMirror	4cce799ace	#2045 - Push SDV sub, cleanup push	2015-08-10 22:08:13 -05:00
PabstMirror	0e17bebd23	Merge branch 'master' into repair	2015-08-09 00:33:08 -05:00
PabstMirror	451c88c601	Merge pull request #2027 from acemod/joinGroupTeamManagement ... EnableTeamManagement setting for joinGroup	2015-08-08 11:16:20 -05:00
jonpas	1aecd54fc3	Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common	2015-08-08 18:02:20 +02:00
PabstMirror	0bd1e1afce	#2024 - EnableTeamManagement setting for joinGroup	2015-08-05 18:02:57 -05:00
Harakhti	d0f91c5ebf	Row 1 ... Not a miracle, but it's something.	2015-07-30 14:40:51 +02:00
Jonathan Pereira	5609ec7b6b	Added PT-BR translations ... New PT-BR translations, including the slideshow and spectator module.	2015-07-25 12:56:50 -03:00
SilentSpike	123825a6fe	Updating zeus waypoint actions icon	2015-07-19 12:23:57 +01:00
Ivan Navarro Cabello	78529af60c	Update spanish translation	2015-07-08 20:57:46 +02:00
ProfessorCZ	89a9218e59	CZ Translation - Update	2015-07-04 15:56:00 +02:00
Glowbal	0bf56d64bd	Readding file that git removed	2015-07-03 22:31:30 +02:00
Glowbal	1ad2a5cdf1	Merge branch 'master' into repair ... Conflicts: addons/interaction/CfgVehicles.hpp	2015-07-03 22:29:29 +02:00