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
15,286 Commits 73 Branches 88 Tags 752 MiB
e6cc5fca89
Commit Graph

341 Commits

Author SHA1 Message Date
PabstMirror
9d24cebb9b Build 35 2018-08-06 11:49:21 -05:00
PabstMirror
d48e336915 v3.12.3 2018-08-02 14:48:41 -05:00
PabstMirror
4df3cfe8a0
Clean up ace_main requiredAddons list (#6332) 
Close #6331
 2018-05-09 10:32:44 -05:00
PabstMirror
3ca1bd77b8 Build Number for RC2 2018-04-16 23:38:58 -05:00
jonpas
1217d912ef Prepare release 3.12.2 2018-04-11 22:20:47 +02:00
PabstMirror
5ea2069b76
Arma 1.82 compat (#6201) 
* Arma 1.82 compat

* Add tank to required addons
 2018-04-11 15:18:05 -05:00
jonpas
88963cdae8 Prepare release 3.12.1 (build 2) 2018-01-15 21:35:34 +01:00
jonpas
2303f345af Prepare release 3.12.1 2018-01-07 02:49:17 +01:00
commy2
3e2ef7ba36 editor icon, editor category, delete on death 2018-01-02 15:56:15 +01:00
Dystopian
03ade05611 Add parentheses to GETVAR macros 2017-12-30 16:38:45 +03:00
jonpas
2ac191dbf7 Prepare release 3.12.0 (build 3) 2017-12-20 16:44:32 +01:00
jonpas
80165fb9c0 Prepare release 3.12.0 (build 2) 2017-12-18 17:43:15 +01:00
jonpas
047591bc2b Prepare release 3.12.0 2017-12-12 12:40:41 +01:00
PabstMirror
61c99cb5d8
Attempt to make enum errors more clear (#5876) 
* Add note to enum script error

* Bump Arma/CBA versions

* req 1.78
 2017-12-08 21:39:35 -06:00
ulteq
9b6f1879f6 Weather - More natural temperature and humidity randomization (#5754) 2017-11-14 14:43:29 +01:00
ulteq
fb0a60b018 Gravity correction 
* ArmA is using 9.8066
 2017-11-08 15:26:39 +01:00
ulteq
e1213483e6 Remove duplicate macro definitions 2017-11-06 18:33:08 +01:00
jonpas
5160a4d767 Prepare release 3.11.0 (build 4) 2017-10-24 15:42:18 +02:00
jonpas
58d69a7978 Prepare release 3.11.0 (build 3) 2017-10-23 20:21:01 +02:00
jonpas
89495d4dc2 Prepare release 3.11.0 (build 2) 2017-10-20 17:36:30 +02:00
jonpas
e6f4046bf8 Prepare release 3.11.0 2017-10-17 20:27:56 +02: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
KoffeinFlummi
32b2d99887 Merge remote-tracking branch 'sbng/master' 2017-09-27 18:57:24 +02:00
sbng-PAPA
37dcb562a7 korean translation for 3.10 2017-09-26 00:54:27 +09: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
40d927d3fd Use selectRandomWeighted 1.76 command (#5482) 2017-09-08 16:18:07 +02:00
commy2
f0818bc8d4 add argo, jets, orange to requiredAddons (#5439) 
* add argo, jets, orange to requiredAddons

* Just add orange's loadorder to required addons
 2017-09-07 18:39:49 +02:00
jonpas
23cf08c237 Prepare release 3.10.2 2017-07-11 00:21:09 +02: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
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
1d355b43db Prepare release 3.10.1 2017-06-21 15:41:02 +02:00
jonpas
9d9edc46c7 Prepare release 3.10.0 (build 2) 2017-06-13 14:03:37 +02:00
jonpas
e0887b3839 Prepare version 3.10.0 2017-06-10 15:27:14 +02:00
jonpas
f7d63336f5 Increase required CBA version to 3.3.1 2017-06-10 15:24:19 +02:00
jonpas
5f0e6b7112 Update required Arma 3 version to 1.70 2017-05-16 14:05:23 +02:00
PabstMirror
6034a13d42 Prep 3.9.2 (version numbers) 2017-05-15 18:00:09 -05:00
Glowbal
b143af0b8c Prep 3.9.1 release 2017-03-21 20:42:39 +01:00
Glowbal
71d9694eb6 Prep 3.9.1 release 2017-03-13 20:48:02 +01:00
jonpas
ca4060b852 Require CBA v3.2.1 (#4954) 
Conflicts:
	addons/main/script_mod.hpp
 2017-03-13 20:40:52 +01:00
PabstMirror
76e9b132d7 Add RHS GREF compat for RKG-3 grenade (#4944) 2017-03-13 20:39:42 +01:00
Glowbal
5240c225e6 Update CBA required version (#4899) 
* prep v3.9.0

* Update required CBA version
 2017-03-13 20:36:49 +01:00
Glowbal
df693d69b6 Prepare v3.9.0 release 2017-02-14 21:25:22 +01:00
Glowbal
c0c41667e7 prep v3.9.0 2017-02-05 13:48:09 +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
Glowbal
c8ef10341e Merged branch release-v3.8.3 into master 2016-12-13 23:14:12 +01:00
Glowbal
0df98f794c Prep 3.8.3 2016-12-12 19:50:16 +01:00
Glowbal
050384e960 Merge branch 'release' 
Conflicts:
	docs/_config.yml
	docs/_config_dev.yml
 2016-11-25 00:08:32 +01:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
Glowbal
9d08ad8238 Prep 3.8.2 release 2016-11-22 18:38:58 +01:00
Glowbal
0394ea56b4 Increment build 2016-11-09 22:07:07 +01:00
Glowbal
3417c433fd Prep v3.8.2 2016-11-09 22:06:48 +01:00
Glowbal
e1aa5b4292 Increment build 2016-10-25 20:27:34 +02:00
Glowbal
27eb30bdd8 Prep 3.8.1 2016-10-25 20:16:16 +02:00
Glowbal
d2f485329f Update make.py to 0.8 (#4579) 2016-10-25 20:11:57 +02:00
Glowbal
1390b845d4 Prep 3.8.1 patch 2016-10-20 19:45:40 +02:00
Glowbal
b150f440e6 Prep 3.8.0 Release 2016-10-18 21:57:40 +02:00
Glowbal
d867805406 Prepare v3.8.0 RC3 2016-10-18 20:25:45 +02:00
Glowbal
d9a199b942 Increment build number 2016-10-15 11:44:43 +02:00
Glowbal
8afb3c7279 Update CBA required version 2016-10-15 11:44:26 +02:00
Glowbal
a98013c36e Merge branch 'master' into release 2016-10-11 18:51:05 +02:00
PabstMirror
cd79ebe3ce Bump REQUIRED_VERSION to 1.64 2016-10-11 18:49:31 +02:00
Glowbal
8e72d89ef6 Prepare 3.80 RC1 2016-10-08 13:10:34 +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
jonpas
8458cb2339 Replace ace_common_fnc_stringRemoveWhiteSpace with CBA_fnc_removeWhitespace (#4222) 
* Replace FUNC(stringRemoveWhiteSpace) with CBA_fnc_removeWhitespace, Depreacte ACE's

* Use QFUNC

* Bump required CBA version

* Change remove version to 3.110.0
 2016-09-30 15:51:03 +02:00
classicarma
a6ae9047f6 translate main 2016-09-28 01:14:28 +09:00
Glowbal
4ae4fca852 Prep 3.7.0 release 2016-09-12 19:47:31 +02:00
Glowbal
04dd0412ff Prepare 3.7.0 RC6 2016-09-09 11:43:40 +02:00
Glowbal
ebdc883855 Prepare 3.7.0 RC5 2016-09-07 21:35:58 +02:00
jonpas
13df3efce2 Prepare 3.7.0 RC4 2016-09-06 22:56:22 +02:00
Glowbal
f3dc1afdbf Prepare 3.7.0 RC3 2016-09-05 22:27:30 +02:00
Glowbal
be8b4468af Increment build number 2016-09-05 08:27:58 +02:00
Glowbal
849a2cd475 Prepare 3.7.0 2016-09-04 21:51:36 +02:00
PabstMirror
7f9a697dca Update CBA_DEBUG_SYNCHRONOUS macro for new CBA (#4271) 2016-08-19 16:33:27 -05:00
commy2
c9a8e0a892 deprecate ACE hash functions in favor of CBA versions 2016-07-30 10:54:01 +02:00
commy2
0c073448dc log file and line numbers for warnings/errors/debug msgs 2016-07-25 20:39:30 +02:00
Glowbal
2f2c4b91a1 3.6.2 2016-07-14 14:51:46 +02:00
Glowbal
de612d9613 Merge branch 'apex' into release 2016-07-11 20:59:34 +02:00
Glowbal
0869cf96bd required arma3 version 1.62. closes #4081 2016-07-11 19:27:40 +02:00
commy2
25a3405d1f required addons apex, close #4020 2016-07-11 12:01:47 +02:00
Glowbal
9b85bc3e29 v3.6.1 2016-07-11 11:15:36 +02:00
jonpas
1185375c90 Add Korean and Japanese strings to tracker 2016-07-08 20:00:12 +02:00
PabstMirror
e40415b628 Add #undef for PREP w/ DISABLE_COMPILE_CACHE 2016-07-04 01:17:30 -05:00
Glowbal
7f7671d5ca Update required arma3 version 2016-06-24 20:58:45 +02:00
Glowbal
37c4351340 Increase required CBA version 2016-06-24 20:56:57 +02:00
Glowbal
284231fe21 3.6.0 2016-06-21 18:07:27 +02:00
Glowbal
ee58df9c34 bump minor version 2016-06-21 17:57:50 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
Glowbal
e540134de1 Change component name to ACE3 2016-06-20 09:57:27 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Glowbal
4c2c647842 Fix change in behaviour of QFUNC 
When using QFUNC, the intend most often is to have the name of the variable referencing the function as a string. This behaviour works when compiling without debug enabled. However if debug is enabled, QFUNC compiles in with the debug wrapper, becoming a code string instead of a string representation of a variable reference.

A good example where this change of behaviour can be a problem is config attributes that refer to a call back (used a lot within ACE). In normal build, you will use a getvar to get the relevant code, as it is expected to point to the function. When using debug, you will need to do a compile instead, as it's a string representing a code block.
 2016-06-17 21:44:04 +02:00
ViperMaul
99d08d988a Merge branch 'master' of https://github.com/acemod/ACE3 into use-proper-undefs 2016-06-14 08:27:47 -07:00
ViperMaul
d5750a6c40 Remove Tab 2016-06-14 08:12:29 -07:00
ViperMaul
b79a00d8d1 These 2 can be removed, since they are in CBA since 2.4.0 as Note from jonpas 2016-06-14 08:11:28 -07:00
ViperMaul
2242f7c622 Fix for MikeRo Tools strict requirement for #undef usage 2016-06-13 09:20:09 -07:00
jonpas
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
PabstMirror
68d6c1969b Cleanup transistion to CBA's waitAndExec (#3858) 2016-06-02 09:22:40 -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
ba27c8f914 Fix WEB_URL end of line error (#3854) 
* Fix WEB_URL end of line error

* Change location of quote macro

* Fix medical_menu VERSION_CONFIG error
 2016-06-01 14:41:33 +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
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
commy2
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros 
Use new quoted function macros
 2016-05-30 21:00:23 +02:00
jonpas
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +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
014421e8ed Remove redundant quoted function macro defines 2016-04-08 20:41:54 +02:00
jonpas
0c124a2af0 Remove redundant macro define 2016-04-08 20:35:50 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
commy2
a4c848a090 formating 2016-03-29 17:00:54 +02:00
PabstMirror
86ad2ab415 Only warn for weapon compat if AB is on 2016-03-24 11:53:55 -05:00
PabstMirror
b0df31783d Merge branch 'master' into compatPboWarnings 2016-03-24 11:23:29 -05:00
Glowbal
485900dce8 increment patch version 2016-03-16 22:59:28 +01:00
PabstMirror
1985e7e20a Fix versioning true when compiled 2016-03-12 13:42:52 -06:00
PabstMirror
ad3a03a9c7 versioning - Add warnings for missing compat PBOs 2016-03-08 13:52:34 -06:00
PabstMirror
53a36f8783 Add REQUIRED_CBA_VERSION macro to script_mod.hpp 2016-03-03 13:00:47 -06:00
PabstMirror
e6a5d2dacd Add CBA 2.3.1 to versioning check 2016-03-02 13:19:20 -06:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
Glowbal
428b828c27 Increase version 3.5.0 2016-02-27 20:44:38 +01:00
jonpas
804456c722 Sort requiredAddons alphabetically 2016-02-24 18:35:52 +01:00
PabstMirror
8cb1546569 Add threeden to required addons and vers to 1.56 2016-02-24 10:52:34 -06:00
PabstMirror
a4391a713d Cleanup old cba SLX_XEH_COMPILE_NEW code 2016-02-22 15:30:16 -06: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
PabstMirror
ed653456e5 Merge pull request #3338 from acemod/translations156merge 
Fix Merge Conflicts on More Italian Translations
 2016-02-19 15:09:40 -06:00
ViperMaul
52b3f1e219 Bump version to 3.4.3 2016-02-18 10:50:33 -08:00
PabstMirror
dccc1d33fd Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge 2016-02-17 12:30:03 -06:00
esteldunedain
a51372a6b3 Add the TRACE_10 macro 2016-02-06 20:28:16 -03:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
PabstMirror
63a79b9920 Use Function Caching in CBA 2016-01-09 01:36:19 -06:00
Glowbal
509e142de8 bump version 3.4.2 2016-01-05 22:42:37 +01:00
commy2
74f78c2dd1 Merge pull request #3010 from acemod/cargoboxfilters 
Add more filters to ammo boxes
 2016-01-05 21:55:24 +01:00
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
commy2
bd3c79f739 add function to retrieve the control of the stamina bar 2015-12-12 20:25:42 +01:00
commy2
2b63b2efa8 add more filters to ammo boxes 2015-12-11 13:14:58 +01:00
Glowbal
0599b35fc6 Bump version to 3.4.1 2015-12-08 14:47:48 +01:00
PabstMirror
358228f5bb Cleanup De Stringtables 2015-12-06 15:03:15 -06:00
licht-im-Norden87
291f4df072 Update German Stringtables 
Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

kommas...........................................................................................................................................................

Rallypoint

Update stringtable.xml

slideshow, not finished yet

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

What does Curator mean in this context?
l. 294, l 302

cargo

Update stringtable.xml

Update stringtable.xml

I left a few things out. I'd like if someone gives me  advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...

Update stringtable.xml

Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Fix Mistakes from merge

Fix Empty Entries

Fix Mistake

Fix
 2015-12-04 22:06:44 -06:00
Glowbal
dacfe4d6cb Bump version to 3.4.0 2015-12-01 17:05:08 +01:00
ViperMaul
4b200d6909 bump to v3.3.3 2015-11-05 14:00:01 -08:00
jonpas
998f3e996c Cleanup macro definitions 2015-10-30 21:59:46 +01:00
PabstMirror
8bb5f71ba1 Macro for non spawned CBA Debug Logging 2015-09-25 22:30:57 -05:00
commy2
617b1ec78d Merge pull request #2556 from acemod/340deprecation 
add deprecated warnings
 2015-09-22 00:52:43 +02:00
PabstMirror
45e44251b6 Merge branch 'release' 
Conflicts:
	addons/repair/stringtable.xml
 2015-09-21 17:14:53 -05:00
Glowbal
62ad9d4284 Version 3.3.2 2015-09-21 22:31:01 +02:00
commy2
f1abd4698f remove superfluous ; 2015-09-21 22:12:17 +02:00