238 Commits

Author	SHA1	Message	Date
PabstMirror	c91789f3c4	Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking	2015-11-06 20:30:12 -06:00
VKing	069169cc72	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
PabstMirror	64de91ed06	Add warning for duplicate setting modules.	2015-10-18 23:34:11 -05:00
commy2	2fe142032e	rework modifier key, cleanup sandbags, tripod, ladder, fix #2590	2015-09-26 03:16:55 +02:00
PabstMirror	ebcc540943	Merge pull request #2572 from acemod/fixClickExplosivePlace ... Delay one frame when selecting explosives	2015-09-22 13:23:33 -05:00
PabstMirror	5add8d6789	#2537 - Delay one frame when selecting explosives	2015-09-22 11:31:58 -05:00
esteldunedain	a621a0c693	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
Ivan Navarro Cabello	463e21dd91	330	2015-09-16 12:40:30 +02:00
Glowbal	7e5ab07e32	Merge pull request #2387 from acemod/FixHCPPE ... Fix that PPEffects Throw a error on HC	2015-09-15 21:04:37 +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
jokoho48	b7e02da1cc	remove if (!hasInterface) from PFH ... move ! in ()	2015-09-11 16:58:26 +02:00
KoffeinFlummi	63c2712360	Merge branch 'release' into portuguese	2015-09-10 21:59:30 +02:00
KoffeinFlummi	c2ffe7cad0	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
KoffeinFlummi	a5621604fd	Merge branch 'release' into czech	2015-09-10 20:51:33 +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
Michael Braun	a5fb09a7e1	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/repair/functions/fnc_moduleRepairSettings.sqf	2015-09-09 02:55:12 +02:00
Jonathan Pereira	7147891710	Added latest ACE3 PT-BR translations	2015-09-05 15:12:31 -03: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
ProfessorCZ	44fa520bdd	Czech Translations - Update	2015-09-03 01:20:24 +02: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
gienkov	17f647f341	PL translation	2015-08-30 01:42:42 +02:00
KoffeinFlummi	a7f2a7fefc	Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3	2015-08-30 00:35:11 +02:00
Michael Braun	5047d4de1c	Switched to ACE_LOG<LEVEL>_# variation	2015-08-26 17:39:44 +02:00
Michael Braun	097506076f	Fixed format usage in macros requiring ARR_# for it to work	2015-08-26 16:48:55 +02:00
Michael Braun	9e10aa86d7	Standardize logging format through ACE_LOG macros	2015-08-26 15:32:54 +02:00
PabstMirror	05925ad7c2	Merge pull request #1902 from acemod/virtualExplosivesPlace ... Virtual explosives place	2015-08-23 16:57:24 -05:00
gienkov	cf585790db	fixes done	2015-08-22 11:41:15 +02:00
PabstMirror	cc9eee5609	Typo	2015-08-21 09:42:23 -05:00
PabstMirror	4c14dc7684	#2208 - Use ACE Message Display instead of sideChat	2015-08-19 17:25:45 -05:00
PabstMirror	61bc40a650	Opps	2015-08-16 02:05:34 -05:00
PabstMirror	b9638f749b	SetPosition Event - Fix digging down (#1991)	2015-08-16 01:51:44 -05:00
PabstMirror	fc6cd34d33	params, cleanup	2015-08-15 14:35:33 -05:00
PabstMirror	7203bb2a3d	Cleanup Debug, Limit Satchel Mass	2015-08-05 12:22:43 -05:00
PabstMirror	a6292db1e8	#2018 - Dead Mans Switch / unconscious	2015-08-05 11:54:45 -05:00
PabstMirror	72273c5ad0	Merge branch 'master' into virtualExplosivesPlace	2015-08-05 11:36:58 -05:00
Harakhti	d0f91c5ebf	Row 1 ... Not a miracle, but it's something.	2015-07-30 14:40:51 +02:00
PabstMirror	214fda074a	Merge branch 'master' into virtualExplosivesPlace	2015-07-28 15:48:37 -05:00
PabstMirror	bfd3aa71c4	Manual Fix #1931	2015-07-28 15:25:52 -05:00
SilentSpike	16597515f0	Adding remaining missing English straings	2015-07-28 20:55:22 +01:00
PabstMirror	9b551e3fdf	#1931 - Fix Explosives Module Strings	2015-07-28 14:42:23 -05:00
PabstMirror	9f078d405b	Tweak Place when Prone	2015-07-25 02:10:33 -05:00
PabstMirror	bff629be9c	Fix PositionAsl / Update mouse hints	2015-07-25 01:42:17 -05:00
PabstMirror	bc953b32bc	More Stuff	2015-07-18 00:36:47 -05:00
Glowbal	0154dfc51e	Merge pull request #1799 from jokoho48/3DModelUpdate ... Add and Update Some 3D Object and Textures	2015-07-17 08:17:42 +02:00
PabstMirror	df90c4b88e	More Attach Stuff	2015-07-16 23:59:31 -05:00
PabstMirror	1f4488253d	Only attach some triggers	2015-07-15 23:52:47 -05:00
Joko	9aa0285064	Revert LoD Changes	2015-07-15 21:13:05 +02:00
Joko	fd4d4abb73	Move UAV Battery form models to data ... change LoD Distance Fix IVBag names(my issue)	2015-07-15 20:51:06 +02:00