Commit Graph

10291 Commits

Author SHA1 Message Date
7ef02400dc adapted to #3378 and added support for UGL 2016-05-17 12:14:57 +02:00
c89163316c fixed idention tabs are 4 spaces now 2016-05-17 11:21:48 +02:00
6d988524d3 Merge branch 'master' of https://github.com/acemod/ACE3 into gunbag 2016-05-17 11:03:57 +02:00
1a14634b41 dissolved some edges 2016-05-17 10:57:24 +02:00
0e2cafcbba Merge pull request #3797 from acemod/add-backwards-compat-inventoryChanged
Add backwards compatability for InventoryChanged
2016-05-16 16:39:12 +02:00
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
473149b8ca revert changes from other PR to make it compatible 2016-05-16 15:22:37 +02:00
cac7b9c0c3 optional param to skip deprecated warning 2016-05-16 15:15:51 +02:00
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
5b460205a9 Add teleport player zeus module 2016-05-15 21:02:40 +01:00
487400b142 Add different warning messages based on current version of component 2016-05-15 20:13:10 +02:00
7a7e930024 Add deprecate sitting component 2016-05-15 19:38:37 +02:00
3d74c25c97 Add deprecate component solution 2016-05-15 19:38:24 +02:00
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
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
da3f6113d6 Merge branch 'master' into add-mine-detector 2016-05-15 00:20:46 +02:00
07caf1b0bd fix for null player 2016-05-14 20:33:33 +02:00
7628f9a4ab Fix nils in array 2016-05-14 13:08:58 -05:00
e4c86a8af5 don't do 'playerInventoryChanged' just because ammo decreased after firing 2016-05-14 19:50:08 +02:00
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
c5275813a4 use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it 2016-05-14 10:49:09 +02:00
04b61ff32e Fix missing semicolon 2016-05-14 10:37:29 +02:00
180a0f9d84 Merge pull request #3462 from acemod/medicalLoops
Cleanup medical PFHs
2016-05-14 09:39:14 +02:00
36e48554c2 Merge pull request #3787 from acemod/motorcycleInteraction
Add interaction support to Motorcycle class
2016-05-14 09:33:41 +02:00
4e109ae93b Merge pull request #3781 from acemod/specTree
Fix spectator unit tree refreshing
2016-05-14 09:26:42 +02:00
e867db3a24 Merge pull request #3780 from acemod/lighter-bodybags
Adjusted weight of bodybag
2016-05-14 09:24:25 +02:00
eb8390741b Change round down mass of body bag
Mass is an integer.
2016-05-14 09:23:29 +02:00
57e83f8b35 Merge pull request #3791 from acemod/dropTestMission
Remove old test-mission
2016-05-14 09:18:06 +02:00
d48bd3ca83 Remove old testmission addon 2016-05-13 19:54:14 -05:00
895bf2580a Merge pull request #3773 from J3aLeiNe/master
fnc_getMGRSdata.sqf update3
2016-05-13 15:59:24 -05:00
dd2767a4ec Merge pull request #3789 from acemod/pushConfig
Add canPush config entry
2016-05-13 11:38:35 -03:00
a950b2c2fe Add canPush config entry to enable pushing on boats with mass higher than 2600 2016-05-13 16:33:15 +02:00
ce3787b3c3 Merge pull request #3768 from acemod/add-zeus-objects-setting
Add zeus objects setting
2016-05-13 10:39:20 +01:00
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
e984fcf715 Fix part name for Tank class 2016-05-12 21:56:12 +02:00
2d2d5bc828 Readd mistakenly removed spare part adding 2016-05-12 21:52:06 +02:00
58cc686aac Remove initial spare part adding for classes not Car or Tank, Improve addSpareParts 2016-05-12 21:49:45 +02:00
f6e4bd7a6b Remove redundant spare part adding 2016-05-12 21:37:54 +02:00
c591c7af64 Add interaction support to Motorcycle class 2016-05-12 21:30:32 +02:00
721b161161 Remove useless if statement 2016-05-12 19:56:07 +02:00
7ba02a21ec Merge remote-tracking branch 'refs/remotes/origin/add-mine-detector'
Conflicts:
	addons/minedetector/functions/fnc_detectorLoop.sqf
2016-05-12 19:49:32 +02:00
7cc423d48f Change mindetector sound 2016-05-12 19:44:43 +02:00
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
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
7304bd3fda Merge pull request #3779 from acemod/showvirtualloadingearmenu
show virtual load in inventory menu
2016-05-11 22:57:37 +02:00
dd6241e376 Merge pull request #3778 from acemod/fixGetWeaponState
fix getWeaponState, fix #3777
2016-05-11 22:57:25 +02:00
f9c643b941 Modified fastroping thud sound 2016-05-11 21:05:59 +02:00
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
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
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