Commit Graph

133 Commits

Author SHA1 Message Date
Glowbal
abadf05342 Merge remote-tracking branch 'gienkov/module-translations'
Conflicts:
	addons/medical/stringtable.xml
2015-05-14 16:01:41 +02:00
ulteq
ddbf274c89 ace_ballistics README.md update 2015-05-14 11:23:44 +02:00
Grzegorz Sikora
6a821715a0 Stringtable modules
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
ulteq
09c19e4ec2 Subtle recoil reduction when using a suppressor 2015-05-10 20:58:36 +02:00
ulteq
82f3c65c31 Tuned down the dispersion reduction of suppressors some more 2015-05-10 20:06:27 +02:00
ulteq
235534292f Rifle dispersion overhaul:
*Added dispersion values for the new marksmen rifles (when needed)
*Overworked some of the (ridiculous) existing values
*Made use of the vanilla values whenever possible
2015-05-10 16:31:56 +02:00
ulteq
0e74fa56f7 Corrected several armour piercing round configs 2015-05-08 13:45:00 +02:00
KoffeinFlummi
5e33176b52 Convert ACE_barrelLength(s) to millimeters 2015-05-08 12:47:45 +02:00
KoffeinFlummi
aa9561f287 Convert ACE_barrelTwist to millimeters 2015-05-08 12:46:44 +02:00
KoffeinFlummi
adc758cd14 Convert ACE_bulletLength to millimeters 2015-05-08 12:45:17 +02:00
KoffeinFlummi
ce8e192a01 Convert ACE_caliber to millimeters 2015-05-08 12:44:06 +02:00
KoffeinFlummi
4b3a111681 Convert ACE_barrelLength to meters 2015-05-07 18:44:01 +02:00
KoffeinFlummi
3313582aec Convert ACE_barrelTwist to meters 2015-05-07 18:41:54 +02:00
KoffeinFlummi
68c9127753 Convert ACE_barrelLengths to meters 2015-05-07 18:39:57 +02:00
KoffeinFlummi
27c8255987 Convert ACE_bulletMass to grams 2015-05-07 18:33:34 +02:00
KoffeinFlummi
b20c42398b Convert ACE_bulletLength to meters 2015-05-07 18:29:02 +02:00
KoffeinFlummi
4eaab93fd1 Convert ACE_caliber to meters 2015-05-07 18:21:15 +02:00
ulteq
3fda9e7e7b Merge pull request #997 from ProfessorCZ/master
Czech translation - Update
2015-05-03 17:03:47 +02:00
ProfessorCZ
a0e443cfc6 Czech translation - Update 2015-05-03 11:48:56 +02:00
ulteq
d653aa262a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ballisticsTranslationFix
Conflicts:
	addons/ballistics/stringtable.xml
2015-05-03 10:21:57 +02:00
KoffeinFlummi
298e1d88bd Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
2015-05-02 23:17:39 +02:00
ulteq
e6187adfc7 Removed a trailing space 2015-05-02 22:09:38 +02:00
ulteq
b5ec13b992 Fixed some inconsistencies in the stringtable 2015-05-02 22:07:25 +02:00
Harakhti
6c2717be7f More more translations
Stope.
2015-05-02 18:06:01 +02:00
ToasterBR
021b00c722 Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
KoffeinFlummi
f1ba0cff26 Merge https://github.com/ProfessorCZ/ACE3 into czech-merge
Conflicts:
	AUTHORS.txt
	addons/advanced_ballistics/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
2015-05-02 00:26:25 +02:00
Lukas
1d3f5cc312 Czceh translation 2015-05-02 00:04:50 +02:00
Tachii
66eda924ac Update stringtable.xml 2015-05-01 20:48:37 +03:00
Tachii
b1a23fd3c7 Update stringtable.xml 2015-05-01 20:29:57 +03:00
Tachii
43dea56ae6 Update stringtable.xml 2015-05-01 20:29:00 +03:00
Tachii
66818e0a74 Update stringtable.xml 2015-05-01 20:26:05 +03:00
Tachii
43655d0cec Update stringtable.xml 2015-05-01 20:18:51 +03:00
Tachii
caf301ac99 Update stringtable.xml
Added 1 RU string
2015-05-01 20:15:35 +03:00
KoffeinFlummi
1e786d4a92 Merge https://github.com/FreeZbe/ACE3 into french-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-05-01 17:45:00 +02:00
KoffeinFlummi
5f60321a69 Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
2015-05-01 17:12:00 +02:00
KoffeinFlummi
761e23001f Merge https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00
FreeZbe
820c841b35 Update stringtable.xml 2015-05-01 14:12:10 +02:00
bux578
0f135c5dab fix ballistics stringtable 2015-04-30 15:23:52 +02:00
ulteq
2c97b20781 Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
Conflicts:
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/vehiclelock/stringtable.xml
2015-04-30 13:20:31 +02:00
ulteq
50a8a89b28 Added missing privates 2015-04-30 10:50:49 +02:00
Dimaslg
f8d5c423ae Merge conflicts resolved 2015-04-29 21:15:22 +02:00
ulteq
4e171c2988 Merge pull request #916 from FreeZbe/master
French: update and fix stringtable
2015-04-29 16:46:49 +02:00
FreeZbe
ca7aeece90 French: update stringtable 2015-04-29 16:28:59 +02:00
Bla1337
cfbf3bd053 Localization update 2015-04-29 11:20:21 +03: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
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
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