289 Commits

Author	SHA1	Message	Date
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
commy2	f134a77e98	add and use deprecated macro	2015-09-21 22:09:54 +02:00
commy2	020915a52a	Revert "fix broken log warning macro" ... This reverts commit b1f79f0383.	2015-09-21 21:51:05 +02:00