KoffeinFlummi
b263ac6847
Merge branch 'patch-5' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
addons/common/stringtable.xml
2015-04-29 12:57:48 +02:00
KoffeinFlummi
c854d2208f
Merge branch 'patch-4' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
addons/captives/stringtable.xml
2015-04-29 12:54:20 +02:00
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
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
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
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
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
bux578
621e1513a0
ballistic stringtable fixes
2015-04-28 20:24:59 +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
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
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
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
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
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
Grzegorz Sikora
bcda77c5c7
PL translation
2015-04-28 18:03:35 +02:00
Josuan Albin
b5524fb3ee
French pass
...
* fixed ramp in /aircraft
* added aragmx entry
* added multiple medical entries
* translated missileguidance
* completed mk6mortar
* changed Sanitaire to Médical in realisticnames also fixed some typos
in there and had to rename some of the explosives (weren't fitting in
boxes in game)
* added myself to contributors
2015-04-28 18:00:09 +02:00
NukeDev
1d434949de
Some Italian Translation's Changes
2015-04-28 17:46:35 +02:00
ulteq
dc09c554c0
Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
...
Conflicts:
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
2015-04-28 17:44:58 +02:00
ulteq
2e8070facb
Merge pull request #886 from simon84/german-translations
...
German translations
2015-04-28 16:54:39 +02:00
simon84
8ac6f61fcf
added some translations
...
added some translations
2015-04-28 00:36:37 +02:00
ulteq
79a5077941
Merge pull request #878 from Brisse89/patch-1
...
Less fictional weapon names
2015-04-28 00:02:55 +02:00
PabstMirror
7e0fa18ce7
#770 - Hopefully fix LOS check on flashbang
2015-04-27 16:07:31 -05:00
ruPaladin
59aba3fb34
Update stringtable.xml
2015-04-27 19:33:22 +03:00
ulteq
fa6a2566e3
Fixed a syntax error
2015-04-27 17:48:06 +02:00
Josuan Albin
e8dec708bc
Some french entries and a german duplicate
...
Added some french entries and removed a german duplicate
2015-04-27 16:18:28 +02:00
Brisse89
26bd75084d
Update stringtable.xml
...
Khaybar -> Sama
2015-04-27 14:56:57 +02:00
Brisse89
4ebdd88369
Less fictional weapon names
...
ACP-C2 -> Custom Covert II
KT2002 Katiba -> KH2002 Khaybar
2015-04-27 13:55:50 +02:00
ulteq
1b5756d33c
Added weather update interval module setting
2015-04-27 12:47:26 +02:00
ulteq
79ff3146b5
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-27 12:40:28 +02:00
ulteq
04d3a31b5b
Fixed a typo
2015-04-27 12:34:21 +02:00
ulteq
3c91f6abe3
Added ace/module settings for ace_weather:
...
*enableServerController // weather propagation on the server
*useACEWeather // disable ace weather
*syncRain
*syncWind
*syncMisc
2015-04-27 12:28:56 +02:00
ulteq
135157419e
Merge pull request #876 from Brisse89/patch-2
...
Realistic weapon names: Update stringtable.xml
2015-04-27 12:20:43 +02:00
Brisse89
ecaa23ada2
Update stringtable.xml
...
Removed the space in HK121
2015-04-27 12:17:36 +02:00
Brisse89
faa17d0e56
Update stringtable.xml
...
Noreen Bad News -> Noreen "Bad News" ULR
2015-04-27 12:13:09 +02:00
Brisse89
3339759321
Update stringtable.xml
...
Is this better?
SIG 762 -> SIG 556
HK 122 -> HK 121
2015-04-27 11:58:39 +02:00
ulteq
b0876ca394
Enables: d64783fca1
2015-04-27 11:06:16 +02:00
ulteq
d6f757e096
Enabled scope adjustments for the Khalia (old) optic
2015-04-27 11:04:12 +02:00
