Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,687 Commits 73 Branches 88 Tags 752 MiB
f67b3561e8
Commit Graph

88 Commits

Author SHA1 Message Date
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
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