Commit Graph

49 Commits

Author SHA1 Message Date
84b18d3f06 Slideshow - Add "SlideChanged" event (#7954)
* Implement Events in slideshow framework.

* Update function header

* Pass correct agruments to next call of autoTransiton.

* Add return of slideshow ID

Return slideshow ID so it can be stored for later use with the events.

* Replace repeat code with variable. _image.

* Redundant comment removal

* Update addons/slideshow/functions/fnc_createSlideshow.sqf

Co-authored-by: jonpas <jonpas33@gmail.com>

Co-authored-by: jonpas <jonpas33@gmail.com>
2020-10-25 12:14:57 -05:00
bux
5e1411bee2 Remove Cover Image Stuff, Reverse Arrays 2019-08-13 08:41:30 +02:00
bux
2f0a5e0c84 Make slideshow add slides in proper order by going through the array backwards, add cover image filed for slideshows, fix wonky german translation 2019-08-12 13:23:32 +02:00
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
b5eb4ac834 Fixed Slideshow action numbering (#6198)
Slideshow Action names would not be named on clients because counting was only done on the server, this would result in all actions on one object showing up in the same slideshow set
2018-03-17 18:12:33 +01:00
ffaa195fe5 Conform function headers to coding guidelines (#5255)
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
2017-06-08 15:31:51 +02:00
1590948b92 Fix multiple slideshows sub-actions, Add set name setting (#4904)
* Fix all slides being in multiple slideshows setup, Use private keyword

* Add setting for slides main interaction name

* Update Slideshow documentation

* Add not about new argument added in version
2017-02-24 14:08:18 +01:00
05d30c5573 convert log macros to cba versions (#4282)
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
2016-10-02 12:55:31 +02:00
b489750d5b Minor optimizations using private, params, and isEqualType (#4323)
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
2016-09-04 16:44:22 +02:00
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
76efdbcc1c Merge pull request #2257 from jonpas/parseList
Parse List Common Function
2015-10-18 12:14:18 +02:00
e4d8f13c89 Change may to must in slideshow error log 2015-09-28 16:02:18 +02:00
498dddcc26 Used isEqualTo 2015-09-26 23:06:35 +02:00
b787286837 Fixed allowed data types 2015-09-26 23:02:18 +02:00
4a5d6cade1 Bracket to Brace 2015-09-26 22:54:31 +02:00
64d6a172c7 Improved public function parameter handling, Fixed issue with synchronized objects 2015-09-26 22:53:49 +02:00
2e3014daa3 Merge branch 'master' into parseList
Conflicts:
	addons/common/functions/fnc_assignObjectsInList.sqf
2015-09-21 22:46:01 +02:00
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
644460ed96 Merge branch 'master' into parseList
Conflicts:
	addons/slideshow/functions/fnc_makeList.sqf
2015-09-04 18:40:35 +02:00
def2d29501 Cleaned up slideshow privates 2015-09-02 22:51:31 +02:00
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02:00
097506076f Fixed format usage in macros requiring ARR_# for it to work 2015-08-26 16:48:55 +02:00
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
ef2924623f Added common parseList function for module list parsing 2015-08-24 21:45:02 +02:00
2808ae6fc9 Removed debug 2015-08-23 19:55:52 +02:00
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
5723c5eaac Merge branch 'master' into addMainAction 2015-08-09 13:00:56 -05:00
12399db0ac Merge branch 'master' into slideshowFixes
Conflicts:
	addons/slideshow/functions/fnc_createSlideshow.sqf
2015-08-08 13:00:11 +02:00
8355558db1 Small readability improvement in slideshow 2015-08-08 01:18:48 +02:00
256536467b Fixed no interaction menu support condition 2015-08-07 19:36:10 +02:00
1cec4400b3 Missing count replacement in slideshow module 2015-08-07 15:44:41 +02:00
b2e7cf04c0 Fixed function argument documentation in slideshow 2015-08-07 15:19:59 +02:00
fa56196fe3 Code cleanup of slideshow module 2015-08-07 12:11:34 +02:00
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
2e386038b7 Added support without ace_intract_menu 2015-08-06 23:43:18 +02:00
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
77631eb61c Only add ACE_MainActions if one doesn't exist yet, Cleaned comments 2015-07-16 23:16:09 +02:00
23e7e19100 Fixed macro, Added privates 2015-07-16 22:39:02 +02:00
b266effe5b Made object actions dynamic 2015-07-13 22:07:21 +02:00
4fa1c7dc0a Moved verification to public function, removed unnecessary str 2015-07-13 19:56:25 +02:00
89c5218bbd Fixed module init exit condition 2015-07-12 16:45:09 +02:00
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
a9c6e3c065 Disabled debug 2015-06-29 22:14:38 +02:00
bb3495468e Replaced PFH for waitAndExecute with PFH-like handling 2015-06-29 22:13:28 +02:00
9ee75dbb21 Multiple modules support 2015-06-29 21:54:40 +02:00
7e200afa04 Added automatic slide transitions with custom duration 2015-06-29 21:07:51 +02:00
34b270d89d Added Flat TV support 2015-06-27 04:23:21 +02:00
a7d58f3b9f Fixed project name 2015-06-27 04:13:20 +02:00
77cb278f61 Added Slideshow mission tool 2015-06-27 04:11:57 +02:00