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,987 Commits 73 Branches 88 Tags 752 MiB
12f0cbbef9
Commit Graph

243 Commits

Author SHA1 Message Date
God of Monkeys
72e48c04f0 Update Chinese stringtable content (#5637) 
Update Chinese stringtable content
 2017-10-18 12:01:29 -05:00
Dedmen Miller
81e02a7336 Refactor private ARRAY to private keyword (#5598) 
* Everything

* Fixed missing ;

* Fix missing ; and double private

* Fixed cannot isNull on number

* Turn _temparture back to isNil

* Fix error from merge
 2017-10-10 09:39:59 -05:00
jonpas
eb6e8c0b56 Cleanup optional argument headers (#5543) 2017-09-22 17:33:08 +02:00
KoffeinFlummi
fa02d0d993 Merge tag 'v3.10.2' into armake 2017-09-19 02:13:24 +02: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
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
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
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
jonpas
b2986cea8a Merge branch 'master' into armake 2017-02-07 03:51:29 +01: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
PabstMirror
6fd561f1f0 Change mortar to ammo handling weapon on init (#4678) 
Fix #4649
 2016-11-16 11:00:50 -06:00
PabstMirror
6fce923783 Fix mortar changes for laser shootRay changes 
Ref #4478
 2016-10-15 11:42:09 +02:00
PabstMirror
ef9fd92898 Show correct elev for mortar with no ammo (#4478) 
Fix #3757
 2016-10-07 17:06:04 -05: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
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
classicarma
6084b81e51 translate mk5motar 2016-09-28 01:16:42 +09: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
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
[OMCB]kaban
8fc2cbd0ef Russian Translations - Update (#4217) 2016-08-13 11:25:43 +02:00
jonpas
b99b11d066 Merge branch 'master' into armake 2016-06-28 18:29:51 +02:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02: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
Glowbal
8c9b31b1c7 Merge pull request #3815 from acemod/cbaEventSystem 
Deprecate ACE events framework
 2016-06-09 14:20:26 +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
PabstMirror
77baeda976 Merge branch 'master' into huehuehue 2016-06-03 00:01:13 -05: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
331c3c70cb Verify and fix cargo, nametags, rearm, reload, repair, ui, Convert infoDisplayChanged in common and mk6mortar Rsc's 2016-05-24 18:58:27 +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
f956ea557a Merge branch 'master' into armake 2016-05-22 17:41:43 +02: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
KoffeinFlummi
86a94baa8f Rename files for Linux 2016-05-02 21:18:25 +02:00
ProfessorCZ
7d0fcde9fa CZ Translate - Update 
04/30/2016
 2016-04-30 00:57:24 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
Alessandro Foresi
e97c7c0f65 Translation: IT completed (with BOM) 2016-03-27 21:22:15 +02:00
Alessandro Foresi
e5a7578f92 Translation: IT completed (no BOM) 2016-03-27 21:20:15 +02:00
Nicolás Badano
b4f6dbbc18 Merge pull request #3568 from acemod/settingsNameDescp 
Ace_Settings - add name,descption,categories
 2016-03-21 21:24:22 -03:00
SzwedzikPL
8555f00889 remove needless tolower from mortarinit 2016-03-18 17:26:37 +01:00
Thomas Kooi
daceaa9dd8 Merge branch 'master' into settingsNameDescp 2016-03-18 14:48:11 +01:00
SzwedzikPL
32846014a1 fix ammo handling init on dedicated 2016-03-14 14:21:02 +01:00
PabstMirror
b5e95f3945 Add some names/descriptions to settings configs 2016-03-08 01:17:40 -06:00
Nicolás Badano
de6af27912 Merge pull request #3492 from acemod/Fix3491_MortarBoxes 
Replace transportMax... with maximumLoad for mortar boxes.
 2016-03-05 22:09:07 -03:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
VKing
353b5e9ef4 Replace transportMax... with maximumLoad for mortar boxes. 
Fixes 3490
 2016-03-01 21:58:21 +01:00
Jonathan Pereira
309f48ee0b Added remaining PT-BR translarions 2016-03-01 08:56:43 -03:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
PabstMirror
f59e8920f9 Fix Mortar Display 2016-02-25 13:59:00 -06:00
gienkov
d4209b2b42 mk6 tagging and overheating translation, finish 2016-02-25 17:16:36 +01:00
esteldunedain
64a62d65fc More spanish translations 2016-02-25 11:46:56 -03:00
bux578
6070d29f59 Merge pull request #3386 from licht-im-Norden87/patch-53 
German translation Update: MK6 Mortar
 2016-02-25 13:38:42 +01:00
licht-im-Norden87
d13e1272ce Update stringtable.xml 2016-02-22 18:55:45 +01:00
commy2
72fe155cda manual merge 2016-02-22 16:11:10 +01: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
commy2
9ac1f8fc47 use DisplayLoad for turretDisplayLoaded event 2016-02-21 23:13:26 +01:00
licht-im-Norden87
5e0f109b4c Update stringtable.xml 2016-02-21 21:15:38 +01:00
licht-im-Norden87
00c8f7bdef mk6 2016-02-21 20:30:57 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
VKing
74d410688f Add check so vanilla magazines can't be unloaded 2016-02-14 14:10:28 +01:00
VKing
560c509a3a Changed to using playerVehicleChanged. 2016-02-14 13:51:44 +01:00
VKing
f652db1d2f Add Loadout box for easy conversion 2016-02-04 20:35:00 +01:00
Glowbal
376b611b89 Merge branch 'master' into Mortar_interact 2016-02-04 20:21:03 +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
VKing
222b15634f Increase prep time for guided projectiles 2015-12-31 22:26:04 +01:00
VKing
38fb97aeac Fixed init problem; added mortar ammo boxes 2015-12-20 20:51:44 +01:00
VKing
73720f9313 Too hasty 2015-12-20 18:20:34 +01:00
VKing
b7bd468fdd That ought to not have worked before 2015-12-20 18:18:33 +01:00
VKing
450a18e13a Forgot to disable in case the setting's set to "no" (but why would you ever want to 2015-12-19 21:29:37 +01:00
VKing
f75311917c Upped mortar round mass 2015-12-19 20:49:09 +01:00
VKing
b4cb5c2ba7 Changed mortar initialization to getIn; Zeus-controlled AI will not trigger the init. 2015-12-19 19:54:45 +01:00
VKing
85270e4521 Fix init issue 2015-12-19 18:22:54 +01:00
VKing
a37d97103f Erk 2015-12-19 16:37:30 +01:00
VKing
a336707623 Fixed initialization, added exclude variable to prevent initialization of individual guns (for e.g. AI mortars) 2015-12-19 16:30:01 +01:00
VKing
dfe7c07936 Fix fnc_mortarInit, fnc_loadMagazine, some other stuff 2015-12-19 12:10:12 +01:00
VKing
2c4a25a6c0 Mortar init functions 2015-12-19 02:18:35 +01:00
VKing
579f861b8f Unload to player inventory 2015-12-17 19:25:22 +01:00
VKing
27890a8dab First try at some module control 2015-12-17 11:00:46 +01:00
VKing
a0fdc58ed7 Remove unused variables, spaces 2015-12-17 09:13:23 +01:00
VKing
d8c8d02177 Port inventory picture and model 2015-12-17 00:21:54 +01:00
VKing
e0a21ce144 Completed code porting and interaction 2015-12-16 23:47:14 +01:00
VKing
3e6fc52733 First working iteration. 
Todo:
Implement in module (Choose new or old/don't break old missions)
Magazine UI+model
Add preparing delay
Fix function readmes
Cleanup in functions?
Credits
MP Testing
 2015-12-16 20:22:18 +01:00
VKing
170095ae35 Initial commit for mortar ammunition handling. 2015-12-13 18:27:13 +01:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00