Commit Graph

9692 Commits

Author SHA1 Message Date
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
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
commy2
0e2cafcbba Merge pull request #3797 from acemod/add-backwards-compat-inventoryChanged
Add backwards compatability for InventoryChanged
2016-05-16 16:39:12 +02: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
commy2
473149b8ca revert changes from other PR to make it compatible 2016-05-16 15:22:37 +02:00
commy2
cac7b9c0c3 optional param to skip deprecated warning 2016-05-16 15:15:51 +02:00
Glowbal
32055401d3 Add backwards compatability for InventoryChanged
The output of `getUnitLoadout` is different as `getAllGear`. Using a different format in the event would mean that any eventhandler depending on the inventory output would now be broken.
2016-05-16 00:09:53 +02: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
commy2
cc9e128e74 Merge pull request #3792 from acemod/useGetUnitLoadout
use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it
2016-05-14 13:04:35 +02:00
commy2
c5275813a4 use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it 2016-05-14 10:49:09 +02:00
Glowbal
04b61ff32e Fix missing semicolon 2016-05-14 10:37:29 +02:00
Glowbal
180a0f9d84 Merge pull request #3462 from acemod/medicalLoops
Cleanup medical PFHs
2016-05-14 09:39:14 +02:00
Glowbal
36e48554c2 Merge pull request #3787 from acemod/motorcycleInteraction
Add interaction support to Motorcycle class
2016-05-14 09:33:41 +02:00
Glowbal
4e109ae93b Merge pull request #3781 from acemod/specTree
Fix spectator unit tree refreshing
2016-05-14 09:26:42 +02:00
Glowbal
e867db3a24 Merge pull request #3780 from acemod/lighter-bodybags
Adjusted weight of bodybag
2016-05-14 09:24:25 +02:00
Glowbal
eb8390741b Change round down mass of body bag
Mass is an integer.
2016-05-14 09:23:29 +02:00
Glowbal
57e83f8b35 Merge pull request #3791 from acemod/dropTestMission
Remove old test-mission
2016-05-14 09:18:06 +02:00
PabstMirror
d48bd3ca83 Remove old testmission addon 2016-05-13 19:54:14 -05:00
PabstMirror
895bf2580a Merge pull request #3773 from J3aLeiNe/master
fnc_getMGRSdata.sqf update3
2016-05-13 15:59:24 -05:00
Nicolás Badano
dd2767a4ec Merge pull request #3789 from acemod/pushConfig
Add canPush config entry
2016-05-13 11:38:35 -03:00
jonpas
a950b2c2fe Add canPush config entry to enable pushing on boats with mass higher than 2600 2016-05-13 16:33:15 +02:00
SilentSpike
ce3787b3c3 Merge pull request #3768 from acemod/add-zeus-objects-setting
Add zeus objects setting
2016-05-13 10:39:20 +01:00
commy2
1651b25b0f Merge pull request #3788 from acemod/removeRedundantSparePartAdding
Remove redundant spare part adding and improve addSpareParts function
2016-05-13 07:38:06 +02:00
jonpas
e984fcf715 Fix part name for Tank class 2016-05-12 21:56:12 +02:00
jonpas
2d2d5bc828 Readd mistakenly removed spare part adding 2016-05-12 21:52:06 +02:00
jonpas
58cc686aac Remove initial spare part adding for classes not Car or Tank, Improve addSpareParts 2016-05-12 21:49:45 +02:00
jonpas
f6e4bd7a6b Remove redundant spare part adding 2016-05-12 21:37:54 +02:00
jonpas
c591c7af64 Add interaction support to Motorcycle class 2016-05-12 21:30:32 +02:00
jonpas
5147f366a5 Execute take nozzle actions only on progress bar success (#3783)
* Execute take nozzle actions only on progress bar success - fix #3739, Prettify params

* Fix animation on holster
2016-05-12 17:11:35 +02:00
PabstMirror
09371bce96 Merge pull request #3776 from acemod/cleanupFastRopeSounds
FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution
2016-05-11 22:29:28 -05:00
commy2
7304bd3fda Merge pull request #3779 from acemod/showvirtualloadingearmenu
show virtual load in inventory menu
2016-05-11 22:57:37 +02:00
commy2
dd6241e376 Merge pull request #3778 from acemod/fixGetWeaponState
fix getWeaponState, fix #3777
2016-05-11 22:57:25 +02:00
BaerMitUmlaut
f9c643b941 Modified fastroping thud sound 2016-05-11 21:05:59 +02:00
SilentSpike
1b1329b350 Increase spectator unit tree refresh rate
Reduce the time between automated refreshing of the unit tree. Also makes an initial call to the tree populating code upon first opening to remove the initial delay.
2016-05-11 16:01:07 +01:00
SilentSpike
9364ae60df Fix spectator unit tree refreshing
- Account for decrement in node index when culling the tree of sides/groups/units
- Fix non-zero-based index `to` value when navigating the units in the tree
2016-05-11 13:30:17 +01:00
J3aLeiNe
078c1d585f Add Kerama Islands by "Les Vétérans"
add Kerama Islands by "Les Vétérans" with the correct latitude (default config latitude : 1°)
2016-05-11 00:01:35 +02:00
BaerMitUmlaut
38bb4f6c29 Adjusted weight of bodybag 2016-05-10 23:40:03 +02:00
commy2
f738b17db7 show virtual load in inventory menu 2016-05-10 22:32:40 +02:00
commy2
53c9a96c77 fix getWeaponState, fix #3777 2016-05-10 22:14:01 +02:00
J3aLeiNe
c619bcb5a3 Fix "jacobi" latitude and elevationOffset 2016-05-10 19:39:01 +02:00