voiperr
52ea640c4b
ace_map: More realistic flashlight glow + minor fix ( #3824 )
...
* -Converted flashlight glow object to chemlight type (emits light without sprite)
-Fixed issue where glow object was being deleted without being first detached
* Cleanup of temp classes.
* Spaces before and after =
* Moved effects into Effects.hpp.
2016-05-27 19:16:15 +02:00
Nicolás Badano
9cccacd74d
Merge pull request #3823 from gpgpgpgp/patch-1
...
add a line to support JSRS Eden (getting rid of JSRS explosion sound …
2016-05-25 10:39:30 -03:00
gpgpgpgp
cfb3d7f0a9
add a line to support JSRS Eden (getting rid of JSRS explosion sound effect)
...
JSRS Eden defines a SoundSetExplosion[] on ShellBase to define explosion sounds, which gives huntir unexpected exploding sound when used together. Adding SoundSetExplosion[] = {}; shall fix the problem.
2016-05-25 09:17:19 +08:00
Glowbal
5e64ee0c6c
Merge pull request #3820 from acemod/ffvSafeMode
...
Fix Can't toggle safemode in FFV seats
2016-05-24 11:25:06 +02:00
PabstMirror
ccbd52e811
Fix Can't toggle safemode in FFV seats #3819
...
Also block safemode when no weapon
2016-05-23 15:51:09 -05: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
jonpas
bd0e05d7d6
Use CBA config functions, return correct value
2016-05-22 16:18:24 +02:00
jonpas
38b48390b5
Call CBA binocular functions - leave as wrapper
2016-05-22 16:03:41 +02:00
jonpas
bbd96f9e71
Call CBA delayed execution functions, remove ACE's PFH for handling them
2016-05-22 16:01:12 +02:00
jonpas
4b121480bb
Use new binocular magazine CBA functions, deprecate ACE functions
2016-05-22 15:48:03 +02:00
jonpas
d35e89892c
Use new get item and object config CBA functions, deprecate ACE functions
2016-05-22 15:36:31 +02:00
jonpas
e7dbcd7b58
Replace delayed execution functions with new CBA counterparts
2016-05-22 15:29:01 +02:00
jonpas
472e4631d6
Deprecate delayed execution functions
2016-05-22 15:25:59 +02:00
jonpas
d902d1182a
Replace ace_common_fnc_execRemoteFunc with events
2016-05-21 23:55:48 +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
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
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
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
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
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
