250 Commits

Author	SHA1	Message	Date
Githawk	9cfa2f11d9	Stuff ... Arguments, Return Value, (optional)	2016-06-06 20:42:20 +02: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
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	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
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