KoffeinFlummi
|
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 |
|
licht-im-Norden87
|
a01c4a0e0b
|
Update stringtable.xml
|
2015-04-12 13:55:55 +02:00 |
|
esteldunedain
|
dfea99debf
|
Switch "Team" for "Group"
|
2015-04-12 01:32:03 -03:00 |
|
esteldunedain
|
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 |
|
esteldunedain
|
0420a94938
|
Streamline Team management actions
|
2015-04-12 01:19:38 -03:00 |
|
esteldunedain
|
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 |
|
KoffeinFlummi
|
59952441d8
|
Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge
|
2015-04-12 06:22:17 +02:00 |
|
KoffeinFlummi
|
c6efd4e546
|
Merge https://github.com/EpMAK/ACE3 into russian-merge
|
2015-04-12 05:39:46 +02:00 |
|
EpMAK
|
21abff3713
|
Revert "Revert "Russian Translation""
This reverts commit ea04f4ab3e.
|
2015-04-11 21:33:34 +03:00 |
|
EpMAK
|
ea04f4ab3e
|
Revert "Russian Translation"
This reverts commit 17a552bb80.
|
2015-04-11 21:33:07 +03:00 |
|
Kllrt
|
38adfbcb70
|
Added missing CZ strings and made little revision
|
2015-04-11 16:33:00 +02:00 |
|
esteldunedain
|
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 |
|
EpMAK
|
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 |
|
EpMAK
|
68d08b8c7b
|
Revert "Translation"
This reverts commit fab5605ad5.
|
2015-04-10 19:46:18 +03:00 |
|
EpMAK
|
fab5605ad5
|
Translation
Russian translation of the texts
|
2015-04-10 17:51:48 +03:00 |
|
FreeZbe
|
3541500947
|
Translation changes
|
2015-04-10 16:41:51 +02:00 |
|
Anthariel
|
b5841f8f09
|
Update stringtable.xml
Added: French Translation (100%)
|
2015-04-10 06:28:59 +02:00 |
|
Grzegorz
|
2984aa2e8c
|
interaction PL translation
|
2015-04-10 03:26:03 +02:00 |
|
Legolasindar
|
2542f994d6
|
Update stringtable.xml
added spanish translation
|
2015-04-10 01:29:52 +02:00 |
|
Clon1998
|
d7bdb48547
|
Update stringtable.xml
|
2015-04-10 01:15:20 +02:00 |
|
licht-im-Norden87
|
852f939430
|
whoops
|
2015-04-10 01:00:35 +02:00 |
|
licht-im-Norden87
|
7994441968
|
Update stringtable.xml
|
2015-04-09 23:48:21 +02:00 |
|
Pierre Humberdroz (meat)
|
4c49765c8f
|
translation changes
#370
|
2015-04-07 10:39:41 +02:00 |
|
bux578
|
92da20ce62
|
translations
#367
|
2015-04-07 10:02:33 +02:00 |
|
PabstMirror
|
75351f2a5b
|
TapShoulder - fix hint message
|
2015-04-04 17:54:15 -05:00 |
|
esteldunedain
|
a658cafb4e
|
Remove line breaks from actions
|
2015-04-04 01:45:03 -03:00 |
|
Nicolás Badano
|
a823fb2dca
|
Tweaks on action names to:
- Remove >> for submenus
- Split long action names in two lines
|
2015-03-24 00:16:32 -03:00 |
|
Nicolás Badano
|
d7363a6dab
|
Move main interactions to pelvis; leave torso for medical
|
2015-03-21 11:01:38 -03:00 |
|
Nicolás Badano
|
66731c9cdd
|
First rough implementation of the passengers menu, with mounted main actions
|
2015-03-20 00:53:58 -03:00 |
|
Nicolás Badano
|
2e0b195cba
|
Added base action for handheld weapons
|
2015-03-01 01:32:21 -03:00 |
|
Nicolás Badano
|
78b1d698c1
|
Added base actions for limbs on CAManBase
|
2015-03-01 00:52:08 -03:00 |
|
Nicolás Badano
|
2b0cfac8e4
|
Removed obsolote code from ace_interaction (#109)
|
2015-02-28 23:00:24 -03:00 |
|
Nicolás Badano
|
dd92c5e845
|
Tap on either shoulder. "Tap" animation
|
2015-02-19 19:45:46 -03:00 |
|
Nicolás Badano
|
f7d5d615ee
|
allow actions to be defined for different selections
|
2015-02-19 15:36:27 -03:00 |
|
Nicolás Badano
|
1aa862bc3b
|
Change stringtables and main variables prefixes to ACE
|
2015-01-12 01:20:02 -03:00 |
|
Nicolás Badano
|
6769189e7c
|
AGM_Interaction pre CBA
|
2015-01-11 16:32:51 -03:00 |
|