9056 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bux578	aa8d3a3fd0	Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis ... Unified ellipsis	2016-02-23 08:27:28 +01:00
BaerMitUmlaut	74ea79e2cc	Unified ellipsis	2016-02-22 23:51:47 +01:00
jonpas	f7d89479f5	Move jonpas to Core Team in AUTHORS.txt and remove typo	2016-02-22 22:08:10 +01:00
commy2	c721cbf865	Merge pull request #3392 from acemod/fix3391 ... fix error when loading save game, fix #3391	2016-02-22 17:55:34 +01:00
commy2	a09cb1612b	fix error when loading save game, fix #3391	2016-02-22 17:43:34 +01:00
commy2	dc16136aef	Merge pull request #3366 from acemod/cbacanuseweapon ... replace some ace_common_fnc_X with CBA_fnc_X	2016-02-22 16:28:57 +01:00
commy2	4aa3eee04e	Merge pull request #3390 from acemod/removebwa3compat ... remove BWA3 compat pbo (changes now in BW mod)	2016-02-22 16:24:33 +01:00
commy2	9712f9c1a4	manual merge	2016-02-22 16:24:10 +01:00
commy2	5334b228fb	remove BWA3 compat pbo (changes now in BW mod)	2016-02-22 16:18:11 +01:00
commy2	939cd65721	Merge pull request #3369 from acemod/usedisplayloadxeh ... displayLoad xeh for imenu	2016-02-22 16:15:12 +01:00
commy2	72fe155cda	manual merge	2016-02-22 16:11:10 +01:00
commy2	ac3385fb83	manual merge	2016-02-22 16:08:24 +01:00
commy2	c45523475f	manual merge	2016-02-22 16:06:30 +01:00
commy2	0f7bfc0f66	Merge pull request #3389 from acemod/precompileongamestart ... precompile on game start	2016-02-22 16:00:19 +01:00
commy2	46a239f9f6	precompile on game start	2016-02-22 15:20:36 +01:00
bux578	55a6ef1937	Merge pull request #3367 from licht-im-Norden87/patch-43 ... Update German Stringtable	2016-02-22 08:26:23 +01:00
commy2	f4a985fdfd	Merge pull request #3345 from acemod/jrCompat338 ... Add flashsupressor to asdg_MuzzleSlot_338	2016-02-21 23:46:50 +01:00
commy2	dd10fac470	use DisplayLoad for main menu box and to disable options when world=Empty	2016-02-21 23:28:02 +01:00
commy2	9ac1f8fc47	use DisplayLoad for turretDisplayLoaded event	2016-02-21 23:13:26 +01:00
commy2	4c0a817ba8	use precompiled function for optics display	2016-02-21 22:56:35 +01:00
commy2	e1db193099	remove unused config and remove some wrong base classes	2016-02-21 22:50:15 +01:00
commy2	2b9518bf81	use precompiled function for vector display	2016-02-21 22:41:11 +01:00
commy2	da0d37ed0d	remove commented out code	2016-02-21 22:31:14 +01:00
commy2	3f855298e2	remove unused mapDisplayLoaded event and ACE_dlgMap variable	2016-02-21 22:23:46 +01:00
commy2	f43e88ff25	replace zeusDisplayChanged with DisplayLoad event	2016-02-21 22:16:12 +01:00
commy2	4335bfbfcf	replace inventoryDisplayLoaded with DisplayLoad event	2016-02-21 21:24:39 +01:00
commy2	e9808bf20b	remove unused PFH check	2016-02-21 20:42:06 +01:00
commy2	5e486869c0	replace mainDisplayLoaded event with DisplayLoad XEH and add ACE version to main menu (CBA help)	2016-02-21 20:26:30 +01:00
licht-im-Norden87	4036dcaa8e	Update stringtable.xml	2016-02-21 20:05:26 +01:00
licht-im-Norden87	62dc2ffd06	Update stringtable.xml	2016-02-21 20:04:32 +01:00
licht-im-Norden87	3c8b3031d8	Update stringtable.xml	2016-02-21 19:59:06 +01:00
licht-im-Norden87	ce97916fbf	Update stringtable.xml	2016-02-21 19:55:08 +01:00
licht-im-Norden87	574a6a32ea	Update stringtable.xml	2016-02-21 19:54:24 +01:00
PabstMirror	8e944f12d7	Merge pull request #3384 from acemod/gjBIS ... Fix empty callbacks in medical/repair	2016-02-21 12:11:33 -06:00
PabstMirror	2467fa7b0c	Fix empty callbacks in medical/repair	2016-02-21 11:34:25 -06:00
commy2	5dcb8707dd	Merge pull request #3359 from gienkov/edenadditions ... integrate captivity modules with 3DEN	2016-02-21 12:44:39 +01:00
Thomas Kooi	85af7bc882	Merge pull request #3378 from acemod/fixMedTranslations2 ... Properly fix the medical translation file	2016-02-21 11:43:52 +01:00
bux	38c1b45fb9	properly fix the medical translation file	2016-02-21 11:41:53 +01:00
PabstMirror	3d4602e461	Add all joint muzzles and remove from ballistics	2016-02-20 20:03:10 -06:00
PabstMirror	3fbd6cff18	Merge pull request #3368 from acemod/fixNils ... Fix some undefined functions / strings	2016-02-20 19:49:07 -06:00
Nicolás Badano	d7403976aa	Merge pull request #3337 from acemod/overheatingSilencers ... Substantially increase overheating when using silencers or flash suppresors	2016-02-20 22:06:19 -03:00
licht-im-Norden87	360c35dc9c	Update stringtable.xml	2016-02-21 02:04:58 +01:00
licht-im-Norden87	0a0400a7a2	deleted all lines exept for 2 because of obvious reason.	2016-02-21 02:03:30 +01:00
Glowbal	e476701069	Merge branch 'master' of github.com:acemod/ACE3	2016-02-21 01:05:18 +01:00
Glowbal	ea113b8e61	Fix duplicate {	2016-02-21 01:04:12 +01:00
PabstMirror	23eb6ec1f5	Fix double {	2016-02-20 18:01:55 -06:00
Glowbal	7d063d4dee	Merge branch 'master' into medical-focus-feature ... Conflicts: addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf	2016-02-21 00:37:30 +01:00
commy2	f5ef7b6b2d	displayLoad xeh for imenu	2016-02-21 00:36:46 +01:00
PabstMirror	8b932fd5a0	Fix some undefined functions / strings	2016-02-20 16:58:45 -06:00
licht-im-Norden87	a977715460	Merge pull request #37 from licht-im-Norden87/patch-49 ... Viewdistance	2016-02-20 23:54:10 +01:00