7495 Commits

Author	SHA1	Message	Date
GitHawk	53457cfe61	Change documentation header for API fnc	2016-02-25 10:08:20 +01:00
jonpas	804456c722	Sort requiredAddons alphabetically	2016-02-24 18:35:52 +01:00
PabstMirror	8cb1546569	Add threeden to required addons and vers to 1.56	2016-02-24 10:52:34 -06:00
PabstMirror	7cf912222b	Merge pull request #3393 from acemod/3denReplaceDropDown ... Fix 3den attributes	2016-02-23 17:09:03 -06:00
PabstMirror	a437326032	Merge pull request #3400 from acemod/fixLampUnload ... Fix lamp unloading	2016-02-23 17:07:31 -06:00
Nicolás Badano	b55648ccb4	Merge pull request #3402 from acemod/fixCutG ... Fix #3334 replace Purista with Roboto in cargo menu	2016-02-23 18:48:06 -03:00
commy2	b08ae7a266	Merge pull request #3395 from acemod/cba23compile ... Cleanup old cba SLX_XEH_COMPILE_NEW code	2016-02-23 22:43:42 +01:00
jonpas	60fba483fe	Fix #3334 replace Purista with Roboto in cargo menu	2016-02-23 22:30:15 +01:00
jonpas	168ec5344d	Fix #3363 lamp unloading bug, Correct cargo menu button classnames	2016-02-23 22:17:36 +01:00
Thomas Kooi	52108b1737	Merge pull request #3382 from acemod/doAnimEvents ... ObjectEvent Func, swap execRemoteFnc in doAnim	2016-02-23 18:38:43 +01:00
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
PabstMirror	a4391a713d	Cleanup old cba SLX_XEH_COMPILE_NEW code	2016-02-22 15:30:16 -06:00
PabstMirror	9ec4135be9	Add prep	2016-02-22 12:27:27 -06:00
PabstMirror	eb08149946	Merge branch 'master' into doAnimEvents	2016-02-22 12:27:07 -06:00
PabstMirror	330792ba7a	Add medic threeden control	2016-02-22 11:26:32 -06:00
commy2	a09cb1612b	fix error when loading save game, fix #3391	2016-02-22 17:43:34 +01:00
commy2	9712f9c1a4	manual merge	2016-02-22 16:24:10 +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
PabstMirror	e6052aee1f	Fix captives 3den	2016-02-22 03:00:40 -06:00
PabstMirror	ed96307f2f	3den repair - Replace bad combo with custom control	2016-02-22 02:50:20 -06: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	2467fa7b0c	Fix empty callbacks in medical/repair	2016-02-21 11:34:25 -06:00
PabstMirror	cb33666091	ObjectEvent Func, swap execRemoteFnc in doAnim ... #3370	2016-02-21 11:08:07 -06:00
commy2	5dcb8707dd	Merge pull request #3359 from gienkov/edenadditions ... integrate captivity modules with 3DEN	2016-02-21 12:44:39 +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