Glowbal
b489750d5b
Minor optimizations using private, params, and isEqualType ( #4323 )
...
* Optimizations with private, params, and isEqualType
* Fixed tab being used instead of space
* Fixed tabs inserted by notepad++
* More usage of new private syntax and params
- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax
* clean up and formatting
2016-09-04 16:44:22 +02:00
commy2
4f77adaa0c
Merge pull request #4137 from 654wak654/master
...
Use GVAR Macro Where Applicable
2016-07-26 19:15:00 +02:00
jonpas
541349efef
Fix refuel not respecting time acceleration and pause ( #4140 )
...
* Fix refuel not respecting time acceleration and pause
* Make lastTickMissionTime local
2016-07-24 20:11:35 +02:00
Ozan Eğitmen
8f80cd59c8
Use GVAR where applicable
2016-07-20 07:15:18 +03:00
PabstMirror
6c732bf789
Fix action name, put actions on base class
2016-07-05 00:22:47 -05:00
PabstMirror
ea140f63a5
Refuel - Simplify Actions, Fix Van_01 config
2016-07-03 15:17:00 -05:00
BaerMitUmlaut
88b58216ee
Added beautified component names
2016-06-20 11:44:36 +02:00
commy2
c481ddedaf
add 'name' to components
2016-06-19 09:38:39 +02:00
SilentSpike
90ebf9638b
Update common event names to meet new standard
2016-06-04 11:12:56 +01:00
Glowbal
694503c01b
Fix medical events
2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156
Fix medical related events
2016-06-03 20:22:34 +02:00
PabstMirror
d7f9c52c2f
Merge branch 'master' into cbaEventSystem
2016-06-02 19:29:30 -05:00
jonpas
95573ee711
Stringtable URL ( #3855 )
...
* Move url into stringtable to display it properly, Add some missing author and url entries
* Fix main
* Remove duplicate author
2016-06-01 23:45:51 +02:00
commy2
9d61dd6159
Merge pull request #3850 from acemod/fixCfgPatchesAuthor
...
Fix CfgPatches author/ is not a value
2016-06-01 14:24:17 +02:00
jonpas
1354826d56
Put semi-colon to the correct place
2016-06-01 14:11:32 +02:00
jonpas
1331265e65
Move url into a macro
2016-06-01 13:49:10 +02:00
jonpas
6730d016c2
Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility
2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab
Merge branch 'master' into cbaEventSystem
2016-05-31 22:36:08 +02:00
PabstMirror
598c3dc181
Fix 1.60 UBC (slingloads)
2016-05-30 17:11:06 -05:00
jonpas
7a307393a4
Merge branch 'master' into useQuotedPathMacros
2016-05-30 21:14:17 +02:00
SilentSpike
207d6612da
Remove duplicate ACE_newEvents entries
2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4
Run event renaming script
2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644
Replace ACE event system calls with CBA counterparts
...
Regex used:
\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent
E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event
E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01: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
daceaa9dd8
Merge branch 'master' into settingsNameDescp
2016-03-18 14:48:11 +01: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
PabstMirror
b5e95f3945
Add some names/descriptions to settings configs
2016-03-08 01:17:40 -06: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
commy2
fa3913752b
replace XEH_ENABLED macro with actual class, fix #3482 , fix #3483
2016-03-01 17:05:00 +01:00
BlackWindowS
c61e7b5104
Tweaked & added translations
...
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
Thomas Kooi
adcfec6ff0
Merge pull request #3430 from GitHawk/refuel_ropeImprovement
...
Refuel improvements
2016-02-27 12:40:50 +01:00
licht-im-Norden87
cac13e2f4f
refuel
2016-02-26 19:26:34 +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
esteldunedain
3fa3512509
Remaining spanish translations
2016-02-25 12:25:42 -03: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
bux578
aa8d3a3fd0
Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis
...
Unified ellipsis
2016-02-23 08:27:28 +01:00
BaerMitUmlaut
74ea79e2cc
Unified ellipsis
2016-02-22 23:51:47 +01:00
commy2
46a239f9f6
precompile on game start
2016-02-22 15:20:36 +01:00
ChairborneIT
0021bc08df
Added translation for most Italian stringtable entries
2016-02-20 21:39:05 +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
Thomas Kooi
0850ab35e3
Merge pull request #3262 from acemod/nozzleFixes
...
fix some issues with Fuel Nozzle
2016-02-05 09:15:27 +01:00
jokoho48
dc3026366a
remove unneeded files
...
fix hard edge in model
add LOD
2016-02-04 20:52:28 +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
Thomas Kooi
69746a133b
Merge pull request #3254 from ProfessorCZ/master
...
Czech Translation - Update
2016-02-04 19:36:28 +01:00
ProfessorCZ
61611d0ec7
Czech Translation - Update
...
Update
2016-02-03 18:31:31 +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
46d6e92bca
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06: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
VKing
1da2b69de4
Make fuel bladders work
2016-01-14 20:07:32 +01:00
VKing
7158a89de9
Start
2016-01-14 18:48:16 +01:00
VKing
74435ba777
Style guide formatting
2016-01-14 18:47:51 +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
PabstMirror
32b4416c29
Merge pull request #3064 from GitHawk/refuel
...
Adaptation of fnc_makeJerryCan to new interact_menu
2015-12-31 20:12:43 -06:00
PabstMirror
8bdd5d0597
Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge
2015-12-31 14:30:29 -06:00
Githawk
d16417a00b
Changed scope on nozzle
2015-12-22 17:49:58 +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
Jonathan Pereira
ad48f51ec7
Added PT-BR translations
...
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
2015-12-18 15:14:19 -02: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
kaban
fd06472f4d
Russian Translations - Update
2015-12-10 20:32:16 +03:00
PabstMirror
cd68f9b320
Fix refuel unconc error - Man unloading for air
2015-12-07 13:54:41 -06:00
gienkov
56e919dccc
nozzle additonal check condition
2015-12-06 06:47:19 +01:00
gienkov
2c83fe4a11
refuel translation fixes
2015-11-28 13:45:59 +01:00
gienkov
b091b73e24
fixes
2015-11-27 21:54:04 +01:00
gienkov
3250245587
3.4.0 translations and fixes
2015-11-27 21:50:57 +01:00
PabstMirror
4aeeefdfe8
Fix UBC and increase Heli_04 Pod interaction distance
2015-11-26 11:47:25 -06:00
IngoKauffmann
f9266764fb
Moved module to ACE_Logistics
2015-11-24 21:33:38 +01:00
IngoKauffmann
d4c708e731
Missing ;
2015-11-24 17:33:33 +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
f852eb5f4b
Moved compatibility stuff
2015-08-18 23:48:25 +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
539fc69275
Increased interaction distance to 7 (same as attach) to cover bigger vehicles
2015-08-17 01:58:52 +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
68489c456e
Alphabetized PREPs
2015-08-17 01:12:47 +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
IngoKauffmann
214c639839
Added module icon
2015-08-15 23:38:08 +02:00
IngoKauffmann
a576ed82ee
Fixed some macro stuff
2015-08-15 19:26:26 +02:00
IngoKauffmann
94a5b38cf6
Renamed an interaction
2015-08-15 17:24:11 +02:00
IngoKauffmann
67091a7aeb
Added real fuel amounts
...
Some are best guesses though
2015-08-15 16:49:57 +02:00
IngoKauffmann
6dc5050dc3
Missed one return type
2015-08-14 03:21:16 +02:00
IngoKauffmann
de500fb80b
First batch of fixes
2015-08-14 03:18:54 +02:00
IngoKauffmann
7d75f9cd2c
Initial draft
2015-08-13 19:33:55 +02:00
