SilentSpike
242876fa83
Merge remote-tracking branch 'origin/master' into zeusModuleUiExample
2016-06-11 21:02:16 +01:00
jonpas
26fbc36cab
Merge branch 'master' into cbaEventSystem
2016-05-31 22:36:08 +02:00
commy2
7512c4e52e
manual merge
2016-05-30 21:14:34 +02:00
jonpas
4f515ec4e1
QGVAR captives, interaction
2016-05-25 20:23:53 +02:00
jonpas
c4999c13e4
QGVAR and Fix sandbag, tagging, tripod, viewdistance, weather, zeus
2016-05-25 02:19:50 +02:00
SilentSpike
c4b75160a4
Run event renaming script
2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644
Replace ACE event system calls with CBA counterparts
...
Regex used:
\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent
E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event
E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
jonpas
e7dbcd7b58
Replace delayed execution functions with new CBA counterparts
2016-05-22 15:29:01 +02:00
SilentSpike
a7c1d0e5bf
Remove erroneous tabs
2016-05-21 17:45:50 +01:00
SilentSpike
3e16142ff6
Merge branch 'master' into zeusModuleUiExample
2016-05-21 17:37:49 +01:00
SilentSpike
b3192adbb7
Add support for a zeus module position attribute
...
Allows zeus to select a position for the module task to be carried out at - as a bonus it works alongside the radius attribute and will draw a circle preview if a radius is present.
Unfortunately control types 100 & 101 don't play nicely with controls groups and so I've commented out the position attribute from the displays that would currently use it. Otherwise it is all seemingly working fine, just that the position of the control is all wrong and it doesn't stay within the bounds of the controls group.
I opened an issue tracker ticket for the problem here: https://feedback.bistudio.com/T116708
2016-05-21 17:29:53 +01:00
SilentSpike
adaa10aea5
Adjust center of zeus AI task modules
...
The tasks should center on the logic rather than the group leader.
The search nearby module is also deleted after it's processed.
2016-05-19 22:32:05 +01:00
SilentSpike
3a1dba4486
Add zeus defend, patrol and search modules
...
Using a shared `radius` attribute for all of these displays so a generalized method of initializing and retrieving the value associated that was implemented.
2016-05-19 01:24:08 +01:00
SilentSpike
e05f2ca637
Add search nearby building zeus module
2016-05-19 01:24:07 +01:00
SilentSpike
600b71817f
Update zeus module logic deletion behaviour
...
The teleport players module is reusable, while the global AI skill and group side modules should be deleted appropriately once the display is closed.
2016-05-18 16:30:14 +01:00
SilentSpike
8a70cfbcd8
Clean new zeus module config and functions
...
Adds function headers, stringtables and renames some display control classes.
2016-05-18 16:16:35 +01:00
commy2
da70854568
manual merge
2016-05-18 11:48:27 +02:00
SilentSpike
81d854c56a
Add group side zeus module
...
The module is placed on a unit in order to switch the side of that unit's group. A "simple" dialog is used to select the new side.
The dialog code is a little ugly to say the least.
2016-05-17 23:44:17 +01:00
SilentSpike
4cbded1811
Fix zeus cargo display for empty vehicles
...
The cargo wasn't displaying for empty vehicles because they use a different display.
2016-05-17 23:44:16 +01:00
SilentSpike
d90d5a7ac1
Rewrite global AI skill zeus module
...
Remove the use of ace settings and makes the module more zeus specific. It might be worth adding a similar module or mission settings to ace_ai for mission editing.
2016-05-16 15:16:53 +01:00
SilentSpike
5b460205a9
Add teleport player zeus module
2016-05-15 21:02:40 +01:00
SilentSpike
4d028be876
Cleanup zeus display modules
...
Replaces display size and position defines with macros for readability and compactness.
Changes naming convention of functions and displays to distinguish categories and make more readable.
Converts the global set skill module to use display events rather than waiting in a loop for the module to be set and confirmed.
2016-05-15 18:08:54 +01:00
SilentSpike
77de1ec6eb
Update vanilla zeus functions
...
Merges the changes introduced by arma updates to vanilla functions with our overwrites.
I also reverted some of the command capitalization since it makes the process of going through differences quicker in future.
2016-05-15 12:48:32 +01:00
Glowbal
74fd4b4b52
Add run at settings initialized auto add objects
2016-05-08 13:47:35 +02:00
Glowbal
b08af3fea6
Add read auto add objects setting from module
2016-05-08 13:42:45 +02:00
PabstMirror
6f412c312a
Delay calling addCuratorEditableObjects for a frame
...
Fixes createVehicle not always being added on dedicated server.
2016-03-30 10:26:33 -05:00
commy2
467075ad67
replace timePFH with CBA_missionTime
2016-03-02 11:01:39 +01:00
PabstMirror
424c6fe878
Show Cargo Example
2016-02-26 01:37:00 -06:00
PabstMirror
7fc1c87bc4
Global Ai Set Skill Example
2016-02-26 00:57:18 -06:00
commy2
82086efca0
manual merge
2016-02-10 10:11:33 +01:00
commy2
e422388484
fix waitUntil capitalization
2015-11-30 17:28:01 +01:00
commy2
a9ebcf8543
fix setVariable and getVariable capitalization
2015-11-30 17:27:09 +01:00
commy2
b3950bd7f0
fix forEach capitalization
2015-11-30 17:23:48 +01:00
commy2
a8228f60c2
fix configFile capitalization
2015-11-30 17:23:02 +01:00
commy2
2b05f6f451
fix isNil capitalization
2015-11-30 17:22:16 +01:00
commy2
d9b90258bc
fix typeOf capitalization
2015-11-30 17:19:57 +01:00
commy2
34d351c652
fix exitWith capitalization
2015-11-30 17:14:05 +01:00
commy2
0b84bb514b
fix Cfg capitalization
2015-11-30 17:09:26 +01:00
commy2
dcf0a68b80
Revert "fix Cfg capitalization"
...
This reverts commit 43bda9c462
2015-11-30 17:00:32 +01:00
commy2
43bda9c462
fix Cfg capitalization
2015-11-30 16:52:20 +01:00
commy2
ff4406e411
manual merge, more selectRandom command useage
2015-11-29 16:48:23 +01:00
commy2
e5c4d35969
1.55 use new selectRandom command
2015-11-29 16:33:25 +01:00
jonpas
b345db4ae9
Added Zeus modules for adding Spare Tracks and Wheels
2015-09-27 00:29:19 +02:00
SilentSpike
5112bd9bdf
Merge pull request #2163 from acemod/add-objects-to-curator
...
Add objects to all curators
2015-08-21 13:53:45 +01:00
SilentSpike
05bf239d8e
Specify zeus setMedic module conditions further
2015-08-15 21:44:40 +01:00
SilentSpike
c01052e5bf
Update ace_zeus function headers
2015-08-15 21:11:49 +01:00
Glowbal
c7f47c0b34
Replaced check for captive module by check for ACE_medical
2015-08-15 20:31:41 +02:00
Glowbal
ed66255b19
Add objects to all curators
2015-08-15 18:39:43 +02:00
Glowbal
0e57d3d97c
Added assign medic, medicalfacility and medical vehicle curator modules
2015-08-15 18:25:48 +02:00
Michael Braun
1b488a17b5
Fixed typo that slipped into the code
2015-08-05 08:36:01 +02:00
