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,376 Commits 73 Branches 88 Tags 752 MiB
5bf4167d3e
Commit Graph

341 Commits

Author SHA1 Message Date
jonpas
eb6e8c0b56 Cleanup optional argument headers (#5543) 2017-09-22 17:33:08 +02:00
classic
8a0bbf655b Update the Jpn translation (#5536) 
* Update the Jpn translation

support to new entry.

* Update the Jpn translation

Fully translated for the maverick

* add credit

because I am translating mod to Japanese ;)
 2017-09-20 14:59:46 +02:00
Andrea Verano
9e36e0d7ef Italian translation update (#5535) 
Added:
-2 missing entries in captives
 2017-09-20 14:04:56 +02:00
Keithen
7fe932803b Add requireSurrender setting for AI - close #5518 (#5522) 2017-09-19 13:21:30 -05:00
PabstMirror
30a8d2db7b Use CBA Misc Items (#5502) 
* Use CBA Misc Items

* Set required CBA to 3.4.1
 2017-09-12 23:23:45 -05:00
jonpas
e11e102a76 Underwater actions support (#4984) 
* Enable majority of actions underwater

* Remove log

* Add logistics_wirecutter support (don't play kneel animations underwater - looks silly)

* Don't perform kneel animations when repairing or medicaling underwater

* Fix interaction menu rendering underwater (was moving based on player eye level due to height max used for large vehicles)

* Fix attach underwater (LIW does not work underwater, LIS does), Add attach scan drawing define

* Remove left-over systemChat

* Remove vehiclelock from Plane, Disallow linking belt underwater, Allow checking ammo when sitting via action (was already possible via keybind), Use param for LIS
 2017-08-22 13:30:56 -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
5cf7569711 Correct new Chinese stringtable identifiers (#5334) 2017-07-08 09:48:39 -05:00
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295) 
Add Chinese Traditional & Simplified Localization
 2017-06-22 16:46:00 +02: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
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
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
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06: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
jonpas
dad4293216 Revert "Update showHud setter for Squad Radar" (#4485) 2016-09-29 17:53:17 -05:00
jonpas
1bd7a66888 Merge pull request #4085 from acemod/apexShowHud 
Update showHud setter for Squad Radar
 2016-09-29 21:11:15 +02:00
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
commy2
e7bc2e9d62 remove deprecated code for 3.8.0 (#4457) 
* remove deprecated scroll wheel event handler

* remove deprecated ace hash functions

* remove deprecated execNextFrame

* remove deprecated insertionSort

* remove deprecated getConfigType

* remove deprecated binocularMagazine

* remove deprecated wait(Until)AndExecute

* remove old ass and deprecated alternative syntax setHitPointDamage

* remove deprecated event handlers (#4459)

* remove deprecated event handlers#

* remove ACE_newEvents

* Remove old ACE PlayerEventHandler wrappers
 2016-09-24 22:31:10 +02:00
classicarma
fb48edb667 translate captives 2016-09-17 00:57:00 +09:00
PabstMirror
b81ccca3f7 Captives - rewrite findEmptyNonFFVCargoSeat (#4348) 
Simplify func using `fullCrew`
Fix #4339
also switch hard `ERROR(` macro to `WARNING(`
 2016-09-13 16:52:51 -05: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
Mark Ruffner
ff297e307b Fix the captive module from creating attributes when not needed (#4213) 
* Fix default values

Fix default values, so we don't get two custom attributes per unit, even when the unit is not handcuffed/surrendered

* Add parentheses to avoid conversion
 2016-08-07 12:50:58 -05:00
PabstMirror
82f63b5935 Update showHud func for 1.62 (squad radar) 2016-07-03 12:17:42 -05:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name 
add 'name' to components
 2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
esteldunedain
dc1c312288 Also handle the surrendering AnimChanged EH 2016-06-19 20:15:51 -03:00
esteldunedain
ac144ca248 Move the AnimChanged EH to its own function to avoid duplication 2016-06-19 19:30:36 -03:00
esteldunedain
8042b888d4 Close #3950 2016-06-19 19:17:49 -03:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Josuan Albin
7c9dcf6bdb Merge branch 'pr/3480' 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/cargo/stringtable.xml
	addons/flashlights/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/main/stringtable.xml
	addons/map/stringtable.xml
 2016-06-18 16:26:46 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
SilentSpike
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +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
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
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime 
replace timePFH with CBA_missionTime
 2016-05-30 21:23:57 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
jonpas
4f515ec4e1 QGVAR captives, interaction 2016-05-25 20:23:53 +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
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
PabstMirror
4826a89ef5 Fix captivity system on dedicated 
Fix #3532
 2016-03-04 11:45:38 -06:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
NorXAengell
772c4cc100 Another batch of translations and corrections (Fr) 2016-03-01 02:27:19 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
NorXAengell
ea461446f9 Translation Fr 2016-02-26 19:24:53 +01:00
ElTyranos
a79cfa583d bux578 correction 2016-02-25 23:47:27 +01:00
NorXAengell
f2fa46ddf0 Translation Fr Captives 2016-02-25 19:36:44 +01:00
esteldunedain
71707bc81a Some spanish translations for 3.5.0 2016-02-25 10:54:19 -03:00
jonpas
1402985133 Fix typos 2016-02-24 19:34:03 +01:00
jonpas
a3d769c410 Cleanup some module descriptions, close #2561 2016-02-24 19:22:16 +01:00
PabstMirror
7cf912222b Merge pull request #3393 from acemod/3denReplaceDropDown 
Fix 3den attributes
 2016-02-23 17:09:03 -06:00
commy2
c45523475f manual merge 2016-02-22 16:06:30 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
PabstMirror
e6052aee1f Fix captives 3den 2016-02-22 03:00:40 -06:00
commy2
f43e88ff25 replace zeusDisplayChanged with DisplayLoad event 2016-02-21 22:16:12 +01:00
commy2
5dcb8707dd Merge pull request #3359 from gienkov/edenadditions 
integrate captivity modules with 3DEN
 2016-02-21 12:44:39 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
PabstMirror
b9cf5817b9 Restore delay in modules 2016-02-20 09:39:15 -06:00
esteldunedain
6523b715fe Delay captivity until 0.05s after settings are initialized 2016-02-20 11:57:47 -03:00
gienkov
1b03ee76fd tabs 2016-02-20 14:07:39 +01:00
gienkov
54b71cc7ba integrate captivity modules with 3DEN 2016-02-20 13:36:53 +01:00
PabstMirror
ed653456e5 Merge pull request #3338 from acemod/translations156merge 
Fix Merge Conflicts on More Italian Translations
 2016-02-19 15:09:40 -06:00
PabstMirror
dccc1d33fd Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge 2016-02-17 12:30:03 -06:00
licht-im-Norden87
39e26b0f11 captives 2016-02-10 17:19:42 +01:00
ProfessorCZ
61611d0ec7 Czech Translation - Update 
Update
 2016-02-03 18:31:31 +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
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
bux
0e8eb5fac4 Remove obsolete hotkey entries 2015-12-30 11:23:52 +01:00
PabstMirror
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
ProfessorCZ
cf41ac5fba Czech Translations - Update 2015-12-04 22:28:10 -06:00
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +01:00
commy2
ca9b909e75 fix CBA_fnc capitalization 2015-11-30 16:45:20 +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
gienkov
7eecff4296 Merge remote-tracking branch 'origin' into pl-translation 
Conflicts:
	addons/captives/stringtable.xml
	addons/map_gestures/stringtable.xml
	addons/zeus/stringtable.xml
 2015-11-27 21:19:25 +01:00
PabstMirror
0b9044e3c7 Merge pull request #2753 from acemod/showHudSetter 
Showhud setter
 2015-11-25 11:16:21 -06:00
PabstMirror
c4117e1283 Merge branch 'master' into settingsErrorChecking 
Conflicts:
	addons/map_gestures/stringtable.xml
 2015-11-20 14:37:23 -06:00
kaban
da16fc1038 \addons\captives\stringtable.xml - resolving conflicts. 2015-11-18 06:50:00 +03:00
PabstMirror
5823749f0c Merge branch 'master' into settingsErrorChecking 2015-11-17 14:00:22 -06:00
commy2
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
Jonathan Pereira
7ec480c98e Added ace_captives translation to PT-BR 2015-11-07 11:39:02 -02:00
gienkov
0b6fcacaf0 pl translation 2015-11-06 00:56:15 +01:00
PabstMirror
cfba7c01e8 Merge branch 'master' into settingsErrorChecking 
Conflicts:
	addons/map_gestures/stringtable.xml
 2015-11-03 12:09:36 -06:00
PabstMirror
1c26f6c9f5 Captives - Module to set handcuffing 
also add player check for GVAR(requireSurrender) in canApplyHandcuffes
 2015-10-23 14:17:31 -05:00
PabstMirror
ef681e4332 Captives - Fix adding duplicate animEH 2015-10-23 13:11:11 -05:00
bux578
602832cc0c adjust german translations 2015-10-19 07:29:02 +02:00