Commit Graph

9952 Commits

Author SHA1 Message Date
commy2
d395fcd792 travis pls 2016-05-21 13:22:13 +02:00
commy2
aee4d23bdb fullCrew new parameter to improve FUNC(getTurretX) 2016-05-21 13:07:17 +02:00
Glowbal
dd60ac8170 Remove isEnabled check in sitting
IsEnabled check is not necessary here. It should not have been included, as it was a left over from testing for migrating sitting to ACEX.
2016-05-21 00:41:49 +02:00
PabstMirror
f69142dd45 Hearing - New XEH, Fix dead effects, Medical var (#3802)
* Hearing - New XEH, Fix dead effects, Medical var

* Use setHearingCapability

* Cleanup dead player vol update

* Don't change global hearing in medical

* Fix exitWith
2016-05-20 11:23:14 -05:00
commy2
f67b3561e8 Merge pull request #3804 from acemod/fcsScopesFFV
Fcs scopes ffv
2016-05-20 15:23:49 +02:00
PabstMirror
d464a23d21 Use the lovely CBA_fnc_canUseWeapon function 2016-05-20 01:10:12 -05:00
PabstMirror
0d5385ffaf Update FCS hud when manually setting range. 2016-05-19 21:50:51 -05:00
PabstMirror
508b71e7ba Scopes - Allow Scope Adjust from FFV 2016-05-19 21:39:15 -05:00
PabstMirror
709916c0f3 Fix UBC errors for RHS 4.1 (#3800) 2016-05-19 19:53:23 -05: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
e1403d567c Merge pull request #3793 from acemod/improvePlayerInventoryChanged
skip 'playerInventoryChanged' after firing
2016-05-18 12:23:28 +02:00
commy2
25876d82ca manual merge 2016-05-18 12:21:53 +02:00
commy2
230f0ab85e manual merge 2016-05-18 12:20:33 +02:00
commy2
08bafd535f deleted to much 2016-05-18 12:00:13 +02:00
commy2
655277cc17 remove previously deleted block 2016-05-18 11:58:42 +02:00
commy2
d93132dac8 more replacing 2016-05-18 11:57:40 +02: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
ir0n1e
4a7f5529f6 added gunbag to ACE_Box_Misc 2016-05-17 12:56:48 +02:00
ir0n1e
8f76e5a4f4 Merge branch 'gunbag' of https://github.com/ir0n1e/ACE3 into gunbag 2016-05-17 12:42:57 +02:00
ir0n1e
3e9cf73b0d added readme 2016-05-17 12:24:18 +02:00
ir0n1e
1302ccb3fe clean up 2016-05-17 12:19:17 +02:00
ir0n1e
7ef02400dc adapted to #3378 and added support for UGL 2016-05-17 12:14:57 +02:00
ir0n1e
c89163316c fixed idention tabs are 4 spaces now 2016-05-17 11:21:48 +02:00
ir0n1e
6d988524d3 Merge branch 'master' of https://github.com/acemod/ACE3 into gunbag 2016-05-17 11:03:57 +02:00
ir0n1e
1a14634b41 dissolved some edges 2016-05-17 10:57:24 +02: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
Glowbal
487400b142 Add different warning messages based on current version of component 2016-05-15 20:13:10 +02:00
Glowbal
7a7e930024 Add deprecate sitting component 2016-05-15 19:38:37 +02:00
Glowbal
3d74c25c97 Add deprecate component solution 2016-05-15 19:38:24 +02: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
07caf1b0bd fix for null player 2016-05-14 20:33:33 +02:00
PabstMirror
7628f9a4ab Fix nils in array 2016-05-14 13:08:58 -05:00
commy2
e4c86a8af5 don't do 'playerInventoryChanged' just because ammo decreased after firing 2016-05-14 19:50:08 +02: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