840 Commits

Author	SHA1	Message	Date
commy2	abf516aeb1	manual merge	2016-01-06 15:57:09 +01:00
PabstMirror	fb0738bd30	Merge branch 'master' into release	2015-12-31 20:27:26 -06:00
PabstMirror	586449eef9	Merge pull request #3084 from acemod/cbaZeusIntegration ... CBA zeus integration	2015-12-31 15:15:23 -06:00
PabstMirror	cf27571b5a	Merge pull request #3007 from dudakov/master ... Russian Translations - Update	2015-12-31 14:11:45 -06:00
PabstMirror	72fe95c797	Add "isNotInZeus" to canInteractWith ... Re-fix #1951 (CTRL+V from climb blocking paste in zeus)	2015-12-30 01:48:43 -06:00
PabstMirror	1e29c0286f	Remove Keybinds/Events for Zeus now handeld in CBA ... Close #2937	2015-12-30 01:07:55 -06:00
Glowbal	c1fa81f28b	Fix tabs in sqf files	2015-12-21 17:05:48 +01:00
PabstMirror	9b0641c06f	Add nil return for count	2015-12-19 21:17:36 -06:00
PabstMirror	c53a0541a4	Add support for non local Zeus RC in common-isPlayer	2015-12-18 11:08:10 -06:00
PabstMirror	0b5b11c966	Merge pull request #3014 from acemod/fixNameSanatize ... Sanitize less/greater-than symbol to square	2015-12-14 19:23:07 -06:00
commy2	e6be1537cd	replace more private with private keyword in common	2015-12-14 13:17:48 +01:00
commy2	bfa29246be	replace private with private keyword in other half of common	2015-12-14 13:08:19 +01:00
PabstMirror	9064579a65	Send string to serverLog instead of strucText ... Fix `Performance warning: SimpleSerialization::Read 'ace_common_remoteFnc' is using type of ,'TEXT' which is not optimized by simple serialization, falling back to generic serialization, use generic type or ask for optimizations for these types`	2015-12-13 13:27:46 -06:00
commy2	bd3c79f739	add function to retrieve the control of the stamina bar	2015-12-12 20:25:42 +01:00
commy2	2839cff753	common code fixes	2015-12-12 17:26:47 +01:00
commy2	3d5ea74c7e	replace private with private keyword in first half of common	2015-12-12 16:48:54 +01:00
PabstMirror	24d77d1b7c	Fix Typo	2015-12-11 12:17:05 -06:00
PabstMirror	db50b5313d	getName can return raw or sanatized html tags	2015-12-11 12:01:50 -06:00
PabstMirror	c7b6375092	Sanitize less/greater-than symbol to square ... Fix #2912 The raw `<` showed up in nametags and anything besides strucText `[ / ]` is fairly close and will work in either text mode.	2015-12-10 23:29:05 -06:00
bux	8e6a057f52	fix common stringtable	2015-12-10 18:48:00 +01:00
[OMCB]kaban	aec2c3fef2	HotFix: removed duplicated key. ... Removed duplicated German key for STR_ACE_Common_DoNotForce. It caused Tabler.exe couldn't read stringtable files.	2015-12-10 18:24:28 +03:00
havena	6f0568c370	fix Unexpected stringtable format ... Unexpected stringtable format inside <Text ID="STR_ACE_Common_CheckPBO_Action_WarnPerm"><German>	2015-12-09 20:18:15 +01:00
PabstMirror	cae9f436f6	Merge branch 'release'	2015-12-08 15:14:33 -06:00
PabstMirror	cd68f9b320	Fix refuel unconc error - Man unloading for air	2015-12-07 13:54:41 -06:00
PabstMirror	39edd205f0	Merge pull request #2942 from acemod/CzechTables ... Czech Translations - Update	2015-12-07 09:32:00 -06:00
PabstMirror	358228f5bb	Cleanup De Stringtables	2015-12-06 15:03:15 -06:00
ProfessorCZ	cf41ac5fba	Czech Translations - Update	2015-12-04 22:28:10 -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
commy2	e418cfcf11	Merge pull request #2935 from acemod/fixbinoculars2 ... Fix binocular related bugs	2015-12-04 21:27:53 +01:00
commy2	5d43fa93c6	fix FUNC(binocularMagazine), fix #2916, fix #2917, fix #2918, fix #2922, fix #2928, fix #2933	2015-12-04 19:37:37 +01:00
PabstMirror	91ace4fc9b	Fix whitelist string -> array error in checkPbo ... Fix #2913 Use splitString instead of call compile to convert string into an array	2015-12-02 23:58:41 -06:00
PabstMirror	c928a0d6cb	Remove Sleep/WaitUntil from checkPBO ... Fix #2910	2015-12-01 22:50:28 -06:00
commy2	861262e41c	revert false captitalization change	2015-11-30 17:56:25 +01:00
commy2	411a8d58f3	fix more setVariable and getVariable capitalization	2015-11-30 17:53:57 +01:00
commy2	5a1aae6028	manual merge	2015-11-30 17:44:15 +01:00
commy2	e422388484	fix waitUntil capitalization	2015-11-30 17:28:01 +01:00
commy2	a9ebcf8543	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
commy2	b3950bd7f0	fix forEach capitalization	2015-11-30 17:23:48 +01:00
commy2	2b05f6f451	fix isNil capitalization	2015-11-30 17:22:16 +01:00
commy2	5e41643cff	fix pushBack capitalization	2015-11-30 17:21:28 +01:00
commy2	d9b90258bc	fix typeOf capitalization	2015-11-30 17:19:57 +01:00
commy2	34d351c652	fix exitWith capitalization	2015-11-30 17:14:05 +01:00
commy2	0b84bb514b	fix Cfg capitalization	2015-11-30 17:09:26 +01:00
commy2	dcf0a68b80	Revert "fix Cfg capitalization" ... This reverts commit 43bda9c462.	2015-11-30 17:00:32 +01:00
commy2	43bda9c462	fix Cfg capitalization	2015-11-30 16:52:20 +01:00
PabstMirror	f676e6d9c9	Add some more typeNames replacements	2015-11-27 21:23:27 -06:00
PabstMirror	5850f78c1f	Merge branch 'master' into isEqualTypeRepalcement	2015-11-27 21:08:21 -06:00
PabstMirror	ca0cfc9bbf	Merge pull request #2861 from acemod/repairRebass ... Repair Overhaul	2015-11-25 17:00:32 -06:00
PabstMirror	0b9044e3c7	Merge pull request #2753 from acemod/showHudSetter ... Showhud setter	2015-11-25 11:16:21 -06:00
PabstMirror	ac6390c0b3	Add array info to header	2015-11-25 11:07:56 -06:00