jonpas
|
7a307393a4
|
Merge branch 'master' into useQuotedPathMacros
|
2016-05-30 21:14:17 +02:00 |
|
jonpas
|
e7dbcd7b58
|
Replace delayed execution functions with new CBA counterparts
|
2016-05-22 15:29:01 +02:00 |
|
jonpas
|
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 |
|
BaerMitUmlaut
|
304f1a22b4
|
Use blockeEngine status effect in refuel
|
2016-05-03 21:08:22 +02:00 |
|
jonpas
|
85b4366368
|
Use new QPATHTOF and QPATHTOEF macros
|
2016-04-08 20:34:50 +02:00 |
|
Thomas Kooi
|
ddd8187b19
|
Merge pull request #3534 from GitHawk/refuel_isEngineOn
Disallow refueling with running engine
|
2016-03-08 19:20:28 +01:00 |
|
jonpas
|
b47b887a21
|
Fix event name already being used
|
2016-03-06 16:20:16 +01:00 |
|
jonpas
|
9463b05218
|
targetEvent -> objectEvent
|
2016-03-05 18:16:09 +01:00 |
|
jonpas
|
881eaf951a
|
Move setVectorDirAndUp and setHitPointDamage events to common, Make refuel set nozzle position execute only on target where local
|
2016-03-05 18:07:07 +01:00 |
|
jonpas
|
589ca27b60
|
Fix missing comma
|
2016-03-05 18:02:21 +01:00 |
|
jonpas
|
015a60e6c4
|
Increase fuel update to 1s
|
2016-03-05 17:44:03 +01:00 |
|
jonpas
|
401d457a46
|
Replace execRemoteFnc with global/targetEvent in refuel
|
2016-03-05 17:41:47 +01:00 |
|
GitHawk
|
0b3abd55d3
|
Disallow refueling with running engine
|
2016-03-04 13:59:14 +01:00 |
|
Githawk
|
c8e8a17111
|
Fixes
- Fixed `isEngineOn` returning true on static objects
- Fixed `fnc_readFuelCounter` for objects with infinite fuel
|
2016-02-26 16:35:34 +01:00 |
|
GitHawk
|
7451d1ee5f
|
Make setFuel and getFuel API
|
2016-02-26 10:50:02 +01:00 |
|
GitHawk
|
0b324336ee
|
Initial pass
Unified ropeDestruction
Added check before ropeCreate
|
2016-02-26 10:46:12 +01:00 |
|
GitHawk
|
5af31f6bb3
|
Remove brackets
|
2016-02-25 10:11:28 +01:00 |
|
GitHawk
|
53457cfe61
|
Change documentation header for API fnc
|
2016-02-25 10:08:20 +01:00 |
|
Thomas Kooi
|
911cba81b7
|
Merge pull request #3347 from GitHawk/refuel_removedTruck
Handling disconnect and removal of fuel truck
|
2016-02-20 17:24:32 +01:00 |
|
Githawk
|
e925c48798
|
Adding HandleDisconnect EH and deletion of fuel truck
|
2016-02-19 17:24:32 +01:00 |
|
Thomas Kooi
|
a8846e92ee
|
Merge pull request #2954 from gienkov/nozzleLogic
nozzle additonal check condition
|
2016-02-17 21:26:04 +01:00 |
|
gienkov
|
8048b2ecbd
|
lazy evaluation fix
|
2016-02-09 09:35:16 +01:00 |
|
Glowbal
|
f1ce133d32
|
Merge branch 'release'
Conflicts:
addons/refuel/functions/fnc_connectNozzle.sqf
|
2016-02-04 20:34:32 +01:00 |
|
Thomas Kooi
|
508f6a16ae
|
Merge pull request #3162 from acemod/Refuel_Fuelbladders
Refuel - Add refuel actions to fuel bladder objects
|
2016-02-04 19:57:50 +01:00 |
|
Githawk
|
cbeac7f154
|
params stuff
|
2016-02-02 15:47:05 +01:00 |
|
Githawk
|
4d403d21aa
|
Fixes
Moved models into data
fixed vehicle attach for certain angles
|
2016-02-02 15:45:57 +01:00 |
|
Githawk
|
5e103ba398
|
Added nozzle
Added code for nozzle object
Params and private update
|
2016-02-02 15:03:06 +01:00 |
|
PabstMirror
|
04bccf47d7
|
Replace all use of deprecated commands
|
2016-01-19 09:39:07 -06:00 |
|
PabstMirror
|
9a3972de76
|
Unified Status Effect Handler
|
2016-01-19 09:39:05 -06:00 |
|
VKing
|
195f0a6874
|
GVAR it
|
2016-01-14 20:07:53 +01:00 |
|
jonpas
|
33f91b2ee7
|
Remove duplicated line caused by merge
|
2016-01-01 03:52:37 +01:00 |
|
jonpas
|
ebf1321c0b
|
Merge branch 'release' into fixFuelHoseExceededAfterDisconnect
|
2016-01-01 03:51:44 +01:00 |
|
Githawk
|
ebb28177b1
|
More fixes to make jerryCan work
|
2015-12-21 17:54:52 +01:00 |
|
Githawk
|
d9e7a43bf7
|
Fixes error with new interact_menu
|
2015-12-21 16:53:25 +01:00 |
|
jonpas
|
4c2d92d360
|
Negate fuel hose connected condition
|
2015-12-12 15:12:50 +01:00 |
|
jonpas
|
e5f64bcdc1
|
Fix refuel PFH not exiting on nozzle disconnect
|
2015-12-11 22:45:28 +01:00 |
|
gienkov
|
56e919dccc
|
nozzle additonal check condition
|
2015-12-06 06:47:19 +01:00 |
|
IngoKauffmann
|
931c6830fc
|
Added reset
It's now possible to reset a fuel truck by console command:
[fuel_truck] call ace_refuel_fnc_reset
|
2015-11-23 19:28:51 +01:00 |
|
IngoKauffmann
|
113ac0f370
|
Minor improvements
fnc_reset is still WIP
|
2015-11-21 23:24:24 +01:00 |
|
IngoKauffmann
|
8b53b4f0d0
|
Fixes
Moved macros to function
Fixed MP bugs
Changed class history of nozzle
|
2015-08-22 13:34:24 +02:00 |
|
IngoKauffmann
|
22576f938e
|
Added dropping and progress bars
|
2015-08-21 22:43:45 +02:00 |
|
IngoKauffmann
|
f44060c6a0
|
Cleanup and improvements
|
2015-08-20 22:10:26 +02:00 |
|
IngoKauffmann
|
cdd0c4c013
|
Next few things
Clean up
Removed MP issues
Added macros for reused code
Added death handling
Added unconscious handling
Added fueling restart
|
2015-08-18 23:18:32 +02:00 |
|
IngoKauffmann
|
2816e8863a
|
Minor fixes
|
2015-08-18 16:09:59 +02:00 |
|
IngoKauffmann
|
f54beb5c86
|
Many things
Added correct hooks for fuel trucks
Added code for finding closest hook
Cleanup
|
2015-08-18 00:42:35 +02:00 |
|
jonpas
|
9ad8718762
|
Added canCheckFuel for check fuel condition, removed extra spaces
|
2015-08-17 01:57:05 +02:00 |
|
jonpas
|
4dc8747430
|
Bypassed interaction menu subactions distance bug
|
2015-08-17 01:44:47 +02:00 |
|
jonpas
|
68370f63d7
|
Fixed returnNozzle function, Moved Return action up
|
2015-08-17 01:24:45 +02:00 |
|
jonpas
|
40eb5a5ba9
|
Made return nozzle bypass connect-attach
|
2015-08-17 01:12:14 +02:00 |
|
jonpas
|
b717ff8dde
|
Fixed interaction menu overwrapping, Moved all actions under one main Refuel action, Changed fuel nozzle pickup action to config
|
2015-08-17 00:55:26 +02:00 |
|