Commit Graph

353 Commits

Author SHA1 Message Date
8b915380b7 Merge branch 'hungarian-merge' 2015-04-15 13:55:02 +02:00
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
10b1587453 Merge pull request #592 from gienkov/master
PL translation
2015-04-14 20:36:25 -03:00
3543b9c806 PL Translation
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
2015-04-15 00:43:42 +02:00
85c10328ae missed one. 2015-04-14 14:58:19 -07:00
df3c8155a0 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 14:45:30 -07:00
c6943fbdaf fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588 2015-04-14 14:45:21 -07:00
ebcdafe610 Fix spelling of "isClientSetable" 2015-04-14 21:43:19 +02:00
b563bf8a8e Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-14 15:04:42 +02:00
63fe4118d4 Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-04-14 14:48:13 +02:00
96319c8799 Merge https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 12:50:14 +02:00
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +02:00
3c3f6ba4c3 Translation: A to I
Some parts filled out, other parts corrected or stylized.
2015-04-13 19:28:58 +02:00
0e6eb46bb4 Merge pull request #560 from gienkov/master
Further PL translation fixes
2015-04-13 19:18:54 +02:00
fa64225e55 Merge pull request #505 from acemod/muteunit
Muteunit framework, fix #473
2015-04-13 19:18:45 +02:00
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
118b5509ea Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-13 13:00:59 +02:00
7523dd011f Update stringtable.xml 2015-04-13 02:06:17 +02:00
74967910a3 opps 2015-04-12 18:27:55 -05:00
d50bff866b addToInventory use addMagazineArray -maybe fix #530 2015-04-12 18:27:25 -05:00
8d79fd242a Update stringtable.xml
Added: Some missing french translations. (I took 10 minutes to translate the banana description (-:)
2015-04-12 18:18:52 +02:00
614afa8537 Merge https://github.com/Kllrt/ACE3 into czech-merge
Conflicts:
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/goggles/stringtable.xml
	addons/grenades/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
2015-04-12 14:27:59 +02:00
45ff6c7ce9 French: (Nearly) Complete French translations
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
2015-04-12 14:15:45 +02:00
7eaee37ff6 Update stringtable.xml 2015-04-12 13:48:59 +02:00
e87f491470 mute implementation in noradio, handle post init on remote units 2015-04-12 11:17:58 +02:00
54f29d75f5 functions to mute unit 2015-04-12 10:05:49 +02:00
018854a7c3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into muteunit 2015-04-12 09:15:45 +02:00
78b64ea273 Missing English 2015-04-12 01:36:41 -05:00
2fc7f44c39 french translation, tabler 4 spaces test 2015-04-12 07:50:23 +02:00
59952441d8 Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-12 06:22:17 +02:00
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
5108137302 Merge https://github.com/Ricciardino/ACE3 into italian-merge 2015-04-12 04:38:46 +02:00
bd07e18b43 Update stringtable.xml 2015-04-12 03:26:45 +02:00
2a2f96a034 ACRE API functions and core functions were incorrect. 2015-04-11 14:10:30 -07:00
458c49b0a7 Merge remote-tracking branch 'origin/master' into javelinLocking
Conflicts:
	addons/common/XEH_preInit.sqf
2015-04-11 14:01:47 -07:00
21abff3713 Revert "Revert "Russian Translation""
This reverts commit ea04f4ab3e.
2015-04-11 21:33:34 +03:00
ea04f4ab3e Revert "Russian Translation"
This reverts commit 17a552bb80.
2015-04-11 21:33:07 +03:00
b9077888aa unmute handleing 2015-04-11 20:26:43 +02:00
12f87013b2 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 19:38:28 +02:00
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
761e4aec64 edit description 2015-04-11 16:27:04 +02:00
62b45a8a07 initial commit 2015-04-11 15:59:21 +02:00
9cf44b1d32 initial commit 2015-04-11 15:46:41 +02:00
4188893839 Move spatial model translations to ace_common 2015-04-10 14:23:55 -07:00
0a88220fc2 Constraints work, added worldToScreenBounds to common. 2015-04-10 14:20:06 -07:00
11ad74735c Merge pull request #458 from Tenga/master
Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera
2015-04-10 22:12:55 +02:00
adc7db9ae9 #456 - Fix AI rotating while dead (disableAI func)
Still some small head movements, but I don't know how to fix that.
2015-04-10 15:02:40 -05:00
2a72e183b1 Merge pull request #450 from Tenga/master
Count the commander camera as a 3rd person camera
2015-04-10 21:54:52 +02:00
229590ed20 Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera 2015-04-10 21:54:47 +02:00