jaynus
7568773ece
class localize and disable all guidance/locking.
2015-04-30 09:00:09 -07:00
jaynus
283e34779f
Don't inherit
2015-04-29 07:05:48 -07: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
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
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
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
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
Grzegorz Sikora
bcda77c5c7
PL translation
2015-04-28 18:03:35 +02:00
ulteq
93dde41c24
Merge pull request #887 from alganthe/master
...
french translation pass
2015-04-28 18:02:46 +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
faf09a2e1f
Merge branch 'gienkov-master'
2015-04-28 17:45:28 +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
d2632fbf47
Merge pull request #877 from acemod/weatherModuleDocumentation
...
Added weather module setting documentation
2015-04-28 17:21:56 +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
Grzegorz Sikora
e874e4329f
PL readme
2015-04-28 00:32:03 +02:00
Grzegorz Sikora
745521990e
Merge branch 'master' of https://github.com/gienkov/ACE3
2015-04-28 00:31:40 +02:00
Grzegorz Sikora
22d569e5ab
README PL
2015-04-28 00:29:48 +02:00
ulteq
79a5077941
Merge pull request #878 from Brisse89/patch-1
...
Less fictional weapon names
2015-04-28 00:02:55 +02:00
simon84
312cdf03ac
Merge remote-tracking branch 'acemod/master'
2015-04-27 23:47:47 +02:00
PabstMirror
7e0fa18ce7
#770 - Hopefully fix LOS check on flashbang
2015-04-27 16:07:31 -05:00
bux578
0991c29d00
Merge pull request #883 from ruPaladin/patch-5
...
Russian translation (medical)
2015-04-27 20:00:33 +02:00
ulteq
ebbcb8e5e7
Fixed a rarely occurring calculation error.
2015-04-27 19:28:46 +02: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
ulteq
b36055b712
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-27 17:35:10 +02:00
ulteq
e4f6a7b2fc
Added scope configs to the RHS compatibility modules
2015-04-27 17:35:03 +02:00
bux578
98dba0ee76
Merge pull request #882 from alganthe/master
...
Some french entries and a german duplicate
2015-04-27 16:41:22 +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
ulteq
0f4a95fddd
Replaced TABs with Spaces
2015-04-27 15:48:53 +02:00
ulteq
66c2e86135
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-27 15:46:55 +02:00
