Commit Graph

106 Commits

Author SHA1 Message Date
jonpas
4a5d6cade1 Bracket to Brace 2015-09-26 22:54:31 +02:00
jonpas
64d6a172c7 Improved public function parameter handling, Fixed issue with synchronized objects 2015-09-26 22:53:49 +02:00
jonpas
2e3014daa3 Merge branch 'master' into parseList
Conflicts:
	addons/common/functions/fnc_assignObjectsInList.sqf
2015-09-21 22:46:01 +02: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
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
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
jonpas
644460ed96 Merge branch 'master' into parseList
Conflicts:
	addons/slideshow/functions/fnc_makeList.sqf
2015-09-04 18:40:35 +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
ProfessorCZ
44fa520bdd Czech Translations - Update 2015-09-03 01:20:24 +02:00
jonpas
def2d29501 Cleaned up slideshow privates 2015-09-02 22:51:31 +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
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
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
jonpas
ef2924623f Added common parseList function for module list parsing 2015-08-24 21:45:02 +02:00
jonpas
2808ae6fc9 Removed debug 2015-08-23 19:55:52 +02:00
jonpas
6d15e63f85 Fixed #2222 - Allow spaces in slideshow module by just trimming the splitted input string rather than removing all whitespace 2015-08-23 19:48:57 +02:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
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
Michael Braun
8355558db1 Small readability improvement in slideshow 2015-08-08 01:18:48 +02:00
jonpas
256536467b Fixed no interaction menu support condition 2015-08-07 19:36:10 +02:00
Michael Braun
1cec4400b3 Missing count replacement in slideshow module 2015-08-07 15:44:41 +02:00
Michael Braun
b2e7cf04c0 Fixed function argument documentation in slideshow 2015-08-07 15:19:59 +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
jonpas
2e386038b7 Added support without ace_intract_menu 2015-08-06 23:43:18 +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
Harakhti
b2aa5eee45 Row 3
BINGO FUEL
2015-07-30 16:28:50 +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
gienkov
2f24b240b4 Fix end line marker 2015-07-23 13:59:50 +02:00
gienkov
61fa466a53 Medical and slideshow pl translation 2015-07-23 13:56:54 +02: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
89c5218bbd Fixed module init exit condition 2015-07-12 16:45:09 +02:00
jonpas
b83b161e3d Fixed default duration value in module init, Added error if required fields left empty, Combined 2 lines 2015-07-12 16:32:48 +02:00
jonpas
f08bd7acc2 Improved Slide Duration module option description 2015-06-29 22:24:16 +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
3ac520eb3e Corrected typo 2015-06-29 21:23:47 +02:00
jonpas
038de8b5cf Added Slideshow module icon 2015-06-29 21:22:59 +02:00
jonpas
7e200afa04 Added automatic slide transitions with custom duration 2015-06-29 21:07:51 +02:00
jonpas
34b270d89d Added Flat TV support 2015-06-27 04:23:21 +02:00
jonpas
a7d58f3b9f Fixed project name 2015-06-27 04:13:20 +02:00
jonpas
77cb278f61 Added Slideshow mission tool 2015-06-27 04:11:57 +02:00