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
Glowbal
da3f6113d6
Merge branch 'master' into add-mine-detector
2016-05-15 00:20:46 +02: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
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
Glowbal
721b161161
Remove useless if statement
2016-05-12 19:56:07 +02:00
