15 Commits

Author	SHA1	Message	Date
PabstMirror	5723c5eaac	Merge branch 'master' into addMainAction	2015-08-09 13:00:56 -05:00
jonpas	12399db0ac	Merge branch 'master' into slideshowFixes ... Conflicts: addons/slideshow/functions/fnc_createSlideshow.sqf	2015-08-08 13:00:11 +02:00
jonpas	256536467b	Fixed no interaction menu support condition	2015-08-07 19:36:10 +02:00
Michael Braun	fa56196fe3	Code cleanup of slideshow module	2015-08-07 12:11:34 +02:00
jonpas	8b802006a4	Moved no interaction menu support inside the function, made code run selectively on server/clients, fixes #2037, closes #1945	2015-08-07 00:32:12 +02:00
PabstMirror	93d2035fed	#1984 - Always make sure ACE_MainActions exists ... Also add debuging output when adding action with no parent	2015-08-02 15:33:16 -05:00
jonpas	77631eb61c	Only add ACE_MainActions if one doesn't exist yet, Cleaned comments	2015-07-16 23:16:09 +02:00
jonpas	23e7e19100	Fixed macro, Added privates	2015-07-16 22:39:02 +02:00
jonpas	b266effe5b	Made object actions dynamic	2015-07-13 22:07:21 +02:00
jonpas	4fa1c7dc0a	Moved verification to public function, removed unnecessary str	2015-07-13 19:56:25 +02:00
jonpas	a9c6e3c065	Disabled debug	2015-06-29 22:14:38 +02:00
jonpas	bb3495468e	Replaced PFH for waitAndExecute with PFH-like handling	2015-06-29 22:13:28 +02:00
jonpas	9ee75dbb21	Multiple modules support	2015-06-29 21:54:40 +02:00
jonpas	7e200afa04	Added automatic slide transitions with custom duration	2015-06-29 21:07:51 +02:00
jonpas	77cb278f61	Added Slideshow mission tool	2015-06-27 04:11:57 +02:00