KoffeinFlummi
ebe5787474
Remove redefinition warnings in make.bat as well
2016-06-18 15:16:44 +02:00
KoffeinFlummi
9a12b74363
Update armake binaries
2016-06-16 23:41:40 +02:00
KoffeinFlummi
e5ef31c556
Disable redefinition warnings
2016-06-16 23:40:46 +02:00
KoffeinFlummi
cd3bea8038
Makefile changes
2016-05-29 22:28:37 +02:00
KoffeinFlummi
1d30092095
Minor Makefile changes
2016-05-28 20:33:49 +02:00
KoffeinFlummi
68a9a6157e
Fix vehiclelock weirdness
2016-05-28 19:54:01 +02:00
KoffeinFlummi
a730c25c88
Add batch file and clean up tools
2016-05-25 06:09:59 +02:00
jonpas
f956ea557a
Merge branch 'master' into armake
2016-05-22 17:41:43 +02:00
jonpas
c91a37e6cc
Read version from script_mod.hpp, Define PREFIX and ZIP
2016-05-22 17:40:50 +02:00
commy2
36205e3864
Merge pull request #3809 from acemod/improve_getTurretX
...
fullCrew new parameter to improve FUNC(getTurretX)
2016-05-22 17:02:45 +02:00
commy2
bb52c55984
Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX
2016-05-22 17:01:10 +02:00
KoffeinFlummi
7f9add4a04
Remove private key before packing
2016-05-21 16:28:39 +02:00
KoffeinFlummi
a5f7cc0129
Add signatures to Makefile
2016-05-21 16:21:51 +02:00
Glowbal
391191241b
Add apply to script validation
2016-05-21 13:46:26 +02:00
commy2
c9ea5676ea
travis test
2016-05-21 13:29:42 +02:00
commy2
e40c814b04
Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX
2016-05-21 13:27:51 +02:00
Glowbal
7f8bfa091a
Merge branch 'master' of github.com:acemod/ACE3
2016-05-21 13:26:46 +02:00
Glowbal
54caadfb88
Add support for new script command select in travis
2016-05-21 13:26:04 +02:00
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
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
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
0e2cafcbba
Merge pull request #3797 from acemod/add-backwards-compat-inventoryChanged
...
Add backwards compatability for InventoryChanged
2016-05-16 16:39:12 +02: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
KoffeinFlummi
d599059716
Fix wrong archive name
2016-05-15 18:25:54 +02:00
KoffeinFlummi
0c5f12fd39
Add optionals to Makefile, fix release building
2016-05-15 18:21:23 +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