KoffeinFlummi
|
a1e709047e
|
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/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/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
|
2015-04-29 12:52:55 +02:00 |
|
Legolasindar
|
1c8137a7e5
|
fixed spanish translate for opened pull #893
fixed spanish translate for opened pull #893
|
2015-04-29 12:46:32 +02:00 |
|
ulteq
|
87d1f7c281
|
Fixes: https://github.com/acemod/ACE3/pull/909#issuecomment-97377112
|
2015-04-29 12:24:56 +02:00 |
|
ulteq
|
0dd23df7dc
|
Merge pull request #911 from Bla1337/master
Russian localization update.
|
2015-04-29 10:47:35 +02:00 |
|
Glowbal
|
7ca35bf823
|
prevent multiple detonators of same type to be displayed #835
As per @CorruptedHeart suggestion.
> Just needs a
> if (getNumber (_config >> "ACE_Detonator") == 1 && {!(_x in _result)}) then {
|
2015-04-29 10:44:10 +02:00 |
|
Bla1337
|
cfbf3bd053
|
Localization update
|
2015-04-29 11:20:21 +03:00 |
|
bux578
|
95536f0a94
|
update authors.txt
|
2015-04-29 10:10:30 +02:00 |
|
Glowbal
|
0c702d6874
|
Merge pull request #907 from acemod/medicaldisplayNameProgress
Display Name Progress Text
|
2015-04-29 09:51:01 +02:00 |
|
PabstMirror
|
47d4446520
|
Don't check intersection if distance < 1m
Related to #869
|
2015-04-29 02:34:47 -05:00 |
|
ulteq
|
f83f8dad0e
|
Fixes: https://github.com/acemod/ACE3/issues/904
|
2015-04-29 09:27:49 +02:00 |
|
PabstMirror
|
d7d43ce3b1
|
#828 - Private Variables for Interact Menu
|
2015-04-29 01:26:13 -05:00 |
|
PabstMirror
|
e56838be36
|
Private Variables
|
2015-04-29 00:05:02 -05:00 |
|
PabstMirror
|
409851dd8c
|
Attach the real explosive
|
2015-04-28 23:57:11 -05:00 |
|
PabstMirror
|
3eb2bdfc84
|
Display Name Progress Text
|
2015-04-28 21:17:29 -05:00 |
|
ulteq
|
a80e11d025
|
Fixed some 7.62 tracer magazines:
*Made use of the ACE_20Rnd_762x51_Mag_Tracer magazine
*Fixed ACE_10Rnd_762x54_Tracer_mag (inheritance, stringtable, tracersEvery)
|
2015-04-29 01:33:26 +02:00 |
|
PabstMirror
|
414a50fb9b
|
Fix Dragging StanceChange Anim
|
2015-04-28 15:40:36 -05:00 |
|
Glowbal
|
a854b90b00
|
Increased level at which a lot of blood message gets shown in basic medical
|
2015-04-28 22:19:30 +02:00 |
|
PabstMirror
|
d12ba0c610
|
Merge pull request #383 from acemod/altSelfInteract
Alt self interact
|
2015-04-28 14:23:17 -05:00 |
|
PabstMirror
|
1512e4c367
|
isClientSettable spelling
|
2015-04-28 14:09:26 -05:00 |
|
PabstMirror
|
9e8b13cd2b
|
Merge branch 'master' into altSelfInteract
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
addons/interact_menu/functions/fnc_renderSelector.sqf
addons/interact_menu/stringtable.xml
|
2015-04-28 14:02:03 -05:00 |
|
Dimaslg
|
956b5e3558
|
Spanish Translation
Minor fixes and some things at the Medical system translated.
|
2015-04-28 21:01:48 +02:00 |
|
Glowbal
|
f606c24854
|
fixes #901
|
2015-04-28 20:47:11 +02:00 |
|
Glowbal
|
dbf748ba93
|
Merge branch 'master' into medicalImprovements
|
2015-04-28 20:33:39 +02:00 |
|
Glowbal
|
c06caa7209
|
Only add JIP event for player clients
|
2015-04-28 20:33:01 +02:00 |
|
Glowbal
|
ebbb88deff
|
Join in progress players will now be initialized
|
2015-04-28 20:32:29 +02:00 |
|
Glowbal
|
95d83554da
|
Added local treatment through remoteExec for basic
|
2015-04-28 20:32:02 +02:00 |
|
PabstMirror
|
9e0932eb56
|
Opps
|
2015-04-28 13:31:47 -05:00 |
|
Grzegorz
|
655b974205
|
Merge pull request #8 from acemod/master
Update master
|
2015-04-28 20:27:57 +02:00 |
|
PabstMirror
|
270f9f3662
|
Fix init order problem
|
2015-04-28 13:26:52 -05:00 |
|
bux578
|
621e1513a0
|
ballistic stringtable fixes
|
2015-04-28 20:24:59 +02:00 |
|
bux578
|
2ba8676658
|
Merge branch 'simon84-german-translations'
|
2015-04-28 20:16:13 +02:00 |
|
bux578
|
4cc6db47de
|
fix merge conflic
|
2015-04-28 20:15:56 +02:00 |
|
ulteq
|
85ce5e3729
|
Unified spacing
|
2015-04-28 19:43:36 +02:00 |
|
NukeDev
|
0b4bb6e4c9
|
Italian's Translation fixes
atragmx, attach, ballistics, captives languages fixes
|
2015-04-28 19:40:36 +02:00 |
|
simon84
|
b119c85c57
|
found some errors
|
2015-04-28 19:36:31 +02:00 |
|
ulteq
|
4cc2d072e6
|
Merge pull request #898 from simon84/german-translations
German translations fixes
|
2015-04-28 19:36:29 +02:00 |
|
ulteq
|
e759989d33
|
Removed debug output
|
2015-04-28 19:33:00 +02:00 |
|
ulteq
|
76393f31db
|
Fixes: https://github.com/acemod/ACE3/issues/896
|
2015-04-28 19:31:38 +02:00 |
|
Glowbal
|
c38fe384e3
|
added default values for getvar's
|
2015-04-28 19:30:35 +02:00 |
|
simon84
|
a244660930
|
German translation fixes
Unified some translations in "ballistics"
e.g. unit mm, Schuss->Patronen, decimal seperator
|
2015-04-28 19:25:45 +02:00 |
|
ulteq
|
a4fd621bd0
|
Merge branch 'NukeDev-master'
|
2015-04-28 18:55:32 +02:00 |
|
ulteq
|
2a759aba70
|
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-28 18:55:23 +02:00 |
|
ulteq
|
d0c7a37841
|
Minor stringtable fix
|
2015-04-28 18:31:14 +02:00 |
|
ulteq
|
908c204893
|
Replaced Tabs with Spaces
|
2015-04-28 18:24:24 +02:00 |
|
ulteq
|
aa824ca137
|
Merge branch 'gienkov-master'
|
2015-04-28 18:15:15 +02:00 |
|
ulteq
|
236fc10a0f
|
Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
Conflicts:
addons/medical/stringtable.xml
|
2015-04-28 18:15:05 +02:00 |
|
NukeDev
|
67a4b7ea30
|
Authors.txt
|
2015-04-28 18:12:05 +02:00 |
|
NukeDev
|
db82df6214
|
Italian's Translation's Changes v2
|
2015-04-28 18:10:35 +02:00 |
|
Grzegorz
|
feeb897fb6
|
Update stringtable.xml
|
2015-04-28 18:05:43 +02:00 |
|
Grzegorz
|
b88618563d
|
Update stringtable.xml
|
2015-04-28 18:05:27 +02:00 |
|