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
14,418 Commits 73 Branches 88 Tags 752 MiB
59fe345f60
Commit Graph

212 Commits

Author SHA1 Message Date
sbng-PAPA
37dcb562a7 korean translation for 3.10 2017-09-26 00:54:27 +09:00
Dystopian
e874f6a343 Fix SDV refueling (#5546) 2017-09-23 01:01:19 +02:00
Andrea Verano
c68ebf2816 Italian translation update (#5542) 
Added:
-Fastroping
-Refuel
-Zeus

Fixed:
-Add full arsenal
-Remove arsenal
 2017-09-22 17:23:11 +02:00
Ozan Eğitmen
41e1b25397 Refuel: Turn on nozzle after connection (#5426) 
* Turn on nozzle after connection

* Remove some superflous progress bars

* Handle tempFuel var

* Handle conflicts 2: conflict harder

* Remove duplicate code
 2017-09-21 16:24:58 +02:00
Andrea Verano
e47212ea9c Italian translation update (#5531) 
Added:
-Advanced Fatigue
-Interactions
-Medical
-Refuel
-Spectator
-Fully translated markers and maverick

Fixed:
-Next Unit
-Previous Unit
 2017-09-19 16:22:11 +02:00
Dystopian
357f3a9ceb Add JIP event deleting if vehicle is deleted (#5506) 2017-09-16 22:18:28 +02:00
PabstMirror
2a8e758390 Allow loading fuel canister (#5493) 
Fix #5438
- Also block cargo action when being used
 2017-09-16 11:36:42 +02:00
classic
2611b56767 Jpn translate e103805 (#5505) 
* Update the Jpn translation for interaction

-fix miss translation
-fix html tag
-support to new words
-tweaks

* fix

i was change the English by mistake. it is fix.

* Update the Jpn translation for markers

support to new words

* Update the Jpn translation for refuel

-fix miss translation
-support to new words
 2017-09-13 10:26:26 -05:00
PabstMirror
d4cd0f2286 Add support for orange drone (UAV_06) (#5494) 
* Add support for orange drone (UAV_06)

- Remove cargo from orange drones (and apex heli drone)
- Allow battery replacement on orange drone

* ops
 2017-09-10 15:38:10 -05:00
Dystopian
559a498e6d Add fast mouse actions to refuel, add refuel eden attributes (#5418) 
* Add fast mouse actions to refuel

* nobody seen that

* Add interaction condition and refuel on ladder

* Add car hit, fix change weapon on uncon

* Replace objNull with nil in setVar, unify var names

* Delete *ConnectNozzle functions

* Delete reset* functions

* Add public function and eden attributes

* Remove static actions from RHS compat

* Remove statusEffect_set on respawn

* Fix dual menu, add deprecating message

* Optimize fnc_takeNozzle

* Cleanup
 2017-09-10 14:43:03 -05:00
PabstMirror
52915e1104 Common func to run config tests (#5170) 
* Common func to run config tests

* Add map config testing, malden data and reverse map config's latitude

* Headers

* Simplify config levels

* Header

* fix example
 2017-08-22 16:21:41 -05:00
Dissyu
a7954368f4 Fix Chinese content & missing string (#5375) 
* Fix missing string with stringtable

Fix Advanced Fatigue & QuickMount

* Fix Chinese content & missing string

* Fix Gestures & DAGR missing string

* Fix quickmount string with vanilla string

* Remove adr97 unnecessary string
 2017-07-19 20:57:20 +02:00
jonpas
6aad1c8af6 Merge branch 'release' 2017-07-18 23:00:48 +02:00
Pawel W
0538647604 Add missing polish translations (#5370) 2017-07-16 23:14:59 -05:00
jonpas
8f494e08ae Add support for Tanoa and Malden Fuel Pumps, Flexible Tanks and Fuel Canister (#5353) 
* Add support for Tanoan fuel pumps, Flexible Tanks and Fuel Canister (as jerry can)

* Add to Land_FuelStation_01_pump_malevil_F

* Add Malden/Jets to required addons

* REQUIRED_VERSION 1.72
 2017-07-10 21:42:21 +02:00
jonpas
13d7de9c92 Prevent taking nozzle if already carried (#5352) 2017-07-10 21:42:11 +02:00
jonpas
84061cb593 Add support for Tanoa and Malden Fuel Pumps, Flexible Tanks and Fuel Canister (#5353) 
* Add support for Tanoan fuel pumps, Flexible Tanks and Fuel Canister (as jerry can)

* Add to Land_FuelStation_01_pump_malevil_F

* Add Malden/Jets to required addons

* REQUIRED_VERSION 1.72
 2017-07-10 21:41:37 +02:00
jonpas
6253ec0915 Prevent taking nozzle if already carried (#5352) 2017-07-10 21:41:23 +02:00
jonpas
fa3743ca54 Correct new Chinese stringtable identifiers (#5334) 2017-07-10 16:47:26 +02:00
GodofMonkeys
0ccbeb25e9 Add Chinese Traditional & Simplified Localization (#5295) 
Add Chinese Traditional & Simplified Localization
 2017-07-10 16:45:22 +02:00
PabstMirror
153fc975f5 Refuel - change nozzle position calc (#5279) 2017-07-10 16:43:14 +02:00
classic
483b41b717 Jpn translate 73bd37 (#5277) 
* Update the Jpn translation for cargo

Update the Japanese translation for cargo

* Add the Jpn translation for hellfire

Add the Japanese translation for hellfire

* Add the Jpn translation for nlaw

Add the Japanese translation for nlaw

* Add the Jpn translation for rearm

Add the Japanese translation for rearm

* Update the Jpn translation for refuel

Update the Japanese translation for refuel

* Update the Jpn translation for repair

Update the Japanese translation for repair

* Update the Jpn translation for zeus

Update the Japanese translation for zeus
 2017-07-10 16:43:03 +02:00
jonpas
5cf7569711 Correct new Chinese stringtable identifiers (#5334) 2017-07-08 09:48:39 -05:00
PabstMirror
d02dacf613 Refuel - change nozzle position calc (#5279) 2017-06-22 22:58:57 -05:00
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295) 
Add Chinese Traditional & Simplified Localization
 2017-06-22 16:46:00 +02:00
classic
a78c42f49e Jpn translate 73bd37 (#5277) 
* Update the Jpn translation for cargo

Update the Japanese translation for cargo

* Add the Jpn translation for hellfire

Add the Japanese translation for hellfire

* Add the Jpn translation for nlaw

Add the Japanese translation for nlaw

* Add the Jpn translation for rearm

Add the Japanese translation for rearm

* Update the Jpn translation for refuel

Update the Japanese translation for refuel

* Update the Jpn translation for repair

Update the Japanese translation for repair

* Update the Jpn translation for zeus

Update the Japanese translation for zeus
 2017-06-13 22:00:38 -05:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255) 
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
 2017-06-08 15:31:51 +02:00
Andrea Verano
0affa14a1b Italian Translation Update (#5243) 
Added Italian translation for:
-cargo
-hellfire
-nlaw
-quickmount
-refuel
-zeus
 2017-06-03 22:27:51 -05:00
PabstMirror
afe862324e Refuel - Add setting for hose length (#5224) 2017-05-31 11:30:48 -05:00
Tim Beswick
3b7a3047cd Refuel for non-AllVehicle objects (#5151) 
* Enabled refuel for non-AllVehicles objects. Un-magic'd refuel progress timer.

* Changed helper attach position to centre of object. Offset applied when rope attached.

* Made fully compatible with non-thingX simulation types. Removed destruction effects of helper object.

* Using arma model. Removed ACE_Actions from helper object.

* Correct use of hideObjectGlobal

* Remove actions, cargo, repair on helper

* Switched helper to be setVar'd on the nozzle object
 2017-05-29 13:48:02 -05:00
Andrea Verano
e3fd1612e2 Italian translation (Add & Fix) (#5193) 
Added Italian translation for:
-advanced fatigue
-advanced throwing
-cook off
-dogtags
-gunbag
-ui-scopes and much more...

Fixed a lot of grammatical errors
 2017-05-23 13:44:17 -05:00
PabstMirror
bfd3695868 SQF Lint Cleanup Pass (#5157) 
* SQF Lint Cleanup Pass

* Fix var in TRACE

* Add basic python tool

* Simplify

* Hit space key 6 times

* Fix error in dropNozzle

* handle error message exceptions

* Fix py
 2017-05-14 14:48:05 -05:00
PabstMirror
f69148bdc0 Disable rearm,refuel on dead vehicles (#5158) 2017-05-13 17:36:53 -05:00
PabstMirror
0cdb2ce238 Increase max weapon index for large modsets (#5054) 2017-05-12 13:12:39 -05:00
PabstMirror
12f42ab39a Jerry Can - only set global var on server (#5131) 2017-05-10 13:13:15 -05:00
jonpas
8dde674105 Fix jerry can refuel interaction overlapping (#5107) 2017-05-05 13:10:50 -05:00
PabstMirror
a08ed0e307 Fix refuel nozzle dropping to ground (#5119) 2017-05-01 18:06:34 -05:00
PabstMirror
3ce0865913 Add getInteractionDistance and fix VTOL refuel/arm (#4882) 2017-02-10 12:34:51 -06:00
jtj5283449
d4855a7ff3 Korean Translation v1.0 (#4794) 
* Add files via upload

* Add files via upload

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.

* Fix encoding
 2017-01-02 17:52:01 -06:00
Dystopian
cc3b669fcd Fix missing refuel menu on static fuel stations (#4533) 
* fix static fuel stations

* Directly compile menus and remove XEH from buildings
 2016-12-14 12:48:00 -06:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
PabstMirror
76eea8924f Invert logic for isRefueling 2016-11-12 16:37:41 -06:00
jonpas
14c9cffb6a Prevent switching to weapon while carrying fuel nozzle - fix #4601 2016-11-02 18:44:39 +01:00
BaerMitUmlaut
60d98df5fc Fix makeJerryCan locality issues (#4600) 2016-10-27 22:19:55 +02:00
jonpas
5922aad91c Fix 3rd party air and sea vehicle fuel capacity (#4554) 
* Fix fuel capacity for air vehicles

* Sea vehicles as well, minor empty classes cleanup
 2016-10-18 20:21:28 +02:00
jonpas
b8cc10fecb Fix #4523 - fuel nozzle disconnect at maximum hose distance 2016-10-11 18:57:58 +02:00
commy2
05d30c5573 convert log macros to cba versions (#4282) 
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
 2016-10-02 12:55:31 +02:00
classicarma
feebd8e1b8 translate refuel 2016-09-28 01:21:49 +09:00
jonpas
2034234940 Refuel nozzle taking, disconnecting, connecting and returning interaction fixes (#4337) 
* Prevent taking or disconnecting a nozzle if already carrying one

* Fix multiple nozzle connect actions, Fix returning nozzle into a vehicle being refueled
 2016-09-05 20:23:28 +02:00
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