1a9f8d86e0
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair
2015-04-24 18:25:34 +02:00
e3a06999c3
Reduce MainActions distance for CAManBase from 5m to 4m
2015-04-24 00:57:49 -03:00
665aa37898
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair
2015-04-21 12:41:12 +02:00
90288b495e
Interactions inside vehicles. Skip the "Main Interactions" level; mount its children intead.
2015-04-20 18:24:12 -03:00
06a4f3d10e
Remove tabler comments.
2015-04-20 15:48:50 +02:00
8530684fa6
PL fix #2
2015-04-19 23:09:11 +02:00
80f37b9ad9
Reword team actions on AI
2015-04-17 01:13:05 -03:00
c8ebed234f
Reword the group actions
2015-04-17 01:01:31 -03:00
1b67b2df26
Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge
...
Conflicts:
addons/disposable/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
2015-04-15 22:20:47 +02:00
234e8e5c40
Merge branch 'patch-1' of https://github.com/Clon1998/ACE3 into german-merge
...
Conflicts:
addons/interaction/stringtable.xml
2015-04-15 21:55:52 +02:00
bc5b9bdfe9
French : update / fix strintable
2015-04-15 20:11:08 +02:00
ad67fca8f4
Update stringtable.xml
2015-04-15 17:45:48 +02:00
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
6e7c1ce9d2
Update stringtable.xml
...
Ita
2015-04-15 11:04:18 +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
6f4bb48489
Merge branch 'master' into linearMenuExperiment
...
Conflicts:
addons/attach/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/overheating/stringtable.xml
extensions/CMakeLists.txt
2015-04-14 19:09:57 -03:00
c1fccecb21
Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge
2015-04-14 15:12:24 +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
3c3f6ba4c3
Translation: A to I
...
Some parts filled out, other parts corrected or stylized.
2015-04-13 19:28:58 +02:00
f6c7d444e1
Merge https://github.com/Anthariel/ACE3 into french-merge
2015-04-13 13:31:48 +02:00
b93cf4fb4a
Merge branch 'polish-merge'
2015-04-13 13:01:17 +02:00
118b5509ea
Merge https://github.com/gienkov/ACE3 into polish-merge
2015-04-13 13:00:59 +02:00
915ac46e04
Very small typo in CZ translation
...
-.-
2015-04-13 11:00:47 +02:00
ccc2124abe
Russian translation for addons/interaction
...
Fix for addons/interaction translation.
2015-04-13 11:53:15 +03:00
2a015482a1
Old Interaction Events (1713999 is long dead)
2015-04-13 01:03:08 -05:00
878bdadbb3
Switch clientInit to postInit
2015-04-13 00:46:45 -05:00
669dbe10c9
BecomeLeader - Don't create new group
2015-04-13 00:23:00 -05:00
67be340360
Update stringtable.xml
2015-04-13 02:05:15 +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
a01c4a0e0b
Update stringtable.xml
2015-04-12 13:55:55 +02:00
dfea99debf
Switch "Team" for "Group"
2015-04-12 01:32:03 -03:00
0565eb6c74
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment
...
Conflicts:
addons/laser_selfdesignate/stringtable.xml
2015-04-12 01:26:55 -03:00
0420a94938
Streamline Team management actions
2015-04-12 01:19:38 -03:00
7b797d906f
Merge branch 'master' into linearMenuExperiment
...
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
addons/overheating/stringtable.xml
2015-04-12 00:19:33 -03: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
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
38adfbcb70
Added missing CZ strings and made little revision
2015-04-11 16:33:00 +02:00
d6e70cfe6b
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
...
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
2015-04-10 16:20:18 -03:00
17a552bb80
Russian Translation
...
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
2015-04-10 19:55:57 +03:00
68d08b8c7b
Revert "Translation"
...
This reverts commit fab5605ad5
2015-04-10 19:46:18 +03:00
fab5605ad5
Translation
...
Russian translation of the texts
2015-04-10 17:51:48 +03:00
3541500947
Translation changes
2015-04-10 16:41:51 +02:00
33a14076fc
Merge branch 'master' of https://github.com/acemod/ACE3 into translations
...
Conflicts:
addons/captives/stringtable.xml
addons/medical/stringtable.xml
2015-04-10 09:01:24 +02:00
b5841f8f09
Update stringtable.xml
...
Added: French Translation (100%)
2015-04-10 06:28:59 +02:00
2984aa2e8c
interaction PL translation
2015-04-10 03:26:03 +02:00
