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
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
Ivan Navarro Cabello
8a55c69cd7
added spanish translation
...
added spanish translation
2015-04-28 17:03:49 +02:00
simon84
8ac6f61fcf
added some translations
...
added some translations
2015-04-28 00:36:37 +02:00
commy2
d6f2ac95dd
fix ace ammo box doesn't show up in zeus
2015-04-26 17:04:49 +02:00
ulteq
5ed7cee6fd
Fixed a copy&paste typo
2015-04-26 09:22:04 +02:00
Felix Wiegand
dc7c7fcaf5
Merge pull request #811 from gienkov/master
...
PL translation
2015-04-25 20:46:47 +02:00
Dimaslg
274663e1b9
Spanish Translation
...
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
ulteq
71df545d52
Improved the Mk248 muzzle velocity shift table
2015-04-25 18:30:58 +02:00
Grzegorz
f3d360d3d8
Update stringtable.xml
2015-04-25 14:36:42 +02:00
ulteq
b405f17df2
Added missing ;
2015-04-24 17:19:18 +02:00
ulteq
709fdcdd08
Merge pull request #821 from Brisse89/master
...
Added realistic tracer burn times for several ammo types
2015-04-24 08:28:43 +02:00
ulteq
b0eadf83c7
Fixed incorrect typicalSpeed
2015-04-23 14:04:01 +02:00
Brisse89
91dfd9802a
Update CfgAmmo.hpp
2015-04-23 13:58:42 +02:00
Brisse89
8d4fff6359
Update CfgAmmo.hpp
2015-04-23 13:56:46 +02:00
Brisse89
5bfa97f490
Update CfgAmmo.hpp
2015-04-23 13:55:26 +02:00
Brisse89
f0a1900ad4
Update CfgAmmo.hpp
2015-04-23 13:53:42 +02:00
Brisse89
ae8a512e8f
Update CfgAmmo.hpp
2015-04-23 13:47:25 +02:00
Brisse89
0001609791
Update CfgAmmo.hpp
...
Added realistic tracer burn times for several ammo types:
B_556x45_Ball (parent for several tracer rounds)
ACE_545x39_Ball_7T3M
B_762x51_Ball (parent for several tracer rounds)
ACE_762x54_Ball_7T2
ACE_762x39_Ball_57N231P
Also changed color on russian tracer rounds from yellow to green, which is what they are in the real world.
2015-04-23 13:44:55 +02:00
ulteq
b1521345c2
Added magazines for the new AP rounds:
...
*Fixed some stringtable inconsistencies
*Removed some obsolete stringtable entries
2015-04-23 13:35:57 +02:00
ulteq
dd72fced36
Added M955, M993, MK316 Mod 0, 127x99mm API ammo classes:
...
*Recalculated the vanilla calibers based on (6.5mm ~ 1.0)
2015-04-23 12:42:01 +02:00
ulteq
e9bb1eea4c
Minor muzzle velocity correction for the 6.5mm Creedmor
2015-04-23 11:27:43 +02:00
ulteq
860b4a446a
Updated the 6.5mm Creedmor airFriction:
...
*Also added it to the ATRagMX gun list
2015-04-22 22:48:38 +02:00
Grzegorz Sikora
1063d4bb2c
PL translation
2015-04-22 13:17:43 +02:00
ulteq
1d108f42a7
Added a magazine for the new 6.5 Creedmor cartridge
...
*Fixed the 65x47mm short name
2015-04-22 11:53:22 +02:00
ulteq
2ec95c2862
Brackets
2015-04-22 11:32:16 +02:00
ulteq
f8006eaac9
Expanded the ammo database:
...
*30-06 Springfield (.30 Cal M1 Ball 174 grain)
*6.5 Creedmore (Berger .264 cal 140 grain Hybrid)
*7mm Rem Mag (Berger .284 cal 180 grain Hybrid)
*.243 Win (Berger .243 cal 105 grain Hybrid)
2015-04-22 11:31:11 +02:00
ulteq
e479557f8a
Some magazine Stringtable fixes
2015-04-22 10:48:45 +02:00
ulteq
a886afb7d0
Added a model for the ACE_Box_Ammo
2015-04-21 23:26:38 +02:00
KoffeinFlummi
65fd6b0937
Merge https://github.com/EpMAK/ACE3 into russian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
2015-04-19 01:04:32 +02:00
KoffeinFlummi
592e0d2dd3
Merge https://github.com/ruPaladin/ACE3 into russian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-04-19 00:51:09 +02:00
Grzegorz Sikora
7489e514ce
PL translation
2015-04-17 21:48:04 +02:00
Aleksey Yermakov
8a669c390a
Update stringtable.xml
2015-04-17 20:35:34 +03:00
Aleksey Yermakov
2f1ee94d91
Update stringtable.xml
2015-04-17 20:24:32 +03:00
Aleksey Yermakov
bf7a7b5bc9
Update stringtable.xml
2015-04-17 20:18:41 +03:00
EpMAK
31a2f1b279
Russian translations
...
Again, filling strings, fixing errors
2015-04-17 19:36:07 +03:00
ruPaladin
b80ec3f790
ballistics russian fixes + multilanguage fix
2015-04-17 15:57:25 +03:00
Ivan Navarro Cabello
61d1e6854e
added spanish translation
...
added spanish translation to ballistics and respawn
2015-04-16 19:03:15 +02:00
KoffeinFlummi
11f9478035
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/scopes/stringtable.xml
addons/weather/stringtable.xml
2015-04-16 18:31:31 +02:00
ulteq
ca3293aa1a
Added ACE_Box_Ammo (WIP):
...
*TODO: Define a model
2015-04-16 13:43:41 +02:00
ulteq
aa724129d1
Tuned down the default timeToLive value.
2015-04-16 10:51:33 +02:00
PabstMirror
c0c5af2957
ballistics - fix ubc
2015-04-15 17:07:06 -05:00
ulteq
0b7ceea64e
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-15 22:50:19 +02:00
ulteq
60c54733cc
Polished the ammo classes some more
2015-04-15 22:49:47 +02:00
FreeZbe
550c32e801
French : update stringtable
2015-04-15 20:53:41 +02:00
ulteq
3a062a4ff9
Fixed incorrect Mk319 Mod 0 BC/airFriction
2015-04-15 20:33:11 +02:00
ulteq
3cff85e85d
Added Mk319 Mod 0 ammo and magazines
2015-04-15 19:51:34 +02:00
ulteq
396bd3954e
Fixed a typo
2015-04-15 19:04:41 +02:00
ulteq
0c4734637b
Fixed the GM6 barrel length and updated the magazines array
2015-04-15 19:00:14 +02:00
ulteq
f8061922f7
Added ACE_10Rnd_338_API526_Mag, ACE_5Rnd_127x99_Mag, ACE_5Rnd_127x99_AMAX_Mag
2015-04-15 18:59:41 +02:00
ulteq
e0c34f22bf
Added ACE_338_Ball_API526 and updated some airFriction values
2015-04-15 18:59:11 +02:00
Ivan Navarro Cabello
40b784fb7a
update stringtable
...
added spanish translate
2015-04-15 17:41:10 +02:00
ulteq
95b04d0840
Added custom airFriction values for the new marksmen ammo types.
2015-04-15 16:22:42 +02:00
KoffeinFlummi
8b915380b7
Merge branch 'hungarian-merge'
2015-04-15 13:55:02 +02:00
KoffeinFlummi
2ffbccbf20
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
2015-04-15 12:59:56 +02:00
ulteq
42dbd8f5d2
Continued work on the magazine classes:
...
*Fixed Katiba using the wrong magazine
*Added ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim
*Added ACE_10Rnd_338_300gr_HPBT_Mag
*Changed some of the .338 magazine initSpeeds to match the new Mar-10 barrel length
*Added the new caseless green ir dim magazine to the ammo crates
*Allowed the Mar-10 to shoot .300 Win Mag
2015-04-15 12:30:48 +02:00
ulteq
bd5ed13621
Added ACE_65x39_Caseless_green_Tracer_Dim
2015-04-15 12:27:20 +02:00
Grzegorz
d538cd257c
PL translation fix
...
Typo, wrote Mk248 Mod 0, should be Mk248 Mod 1
2015-04-15 01:44:33 +02:00
Grzegorz Sikora
3543b9c806
PL Translation
...
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
2015-04-15 00:43:42 +02:00
ulteq
035ed573b8
Reworked the magazine configs
2015-04-14 22:23:36 +02:00
ulteq
1d64b8c36e
Added the new magazines into various ammo boxes
2015-04-14 22:22:36 +02:00
ulteq
e214511e36
Added new magazine classes:
...
*ACE_100Rnd_65x39_caseless_mag_Tracer_Dim
*ACE_200Rnd_65x39_cased_Box_Tracer_Dim
*ACE_30Rnd_556x45_Stanag_Mk262_mag
*ACE_30Rnd_556x45_Stanag_Mk318_mag
*ACE_10Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x67_Mk248_Mod_0_Mag
*ACE_20Rnd_762x67_Mk248_Mod_1_Mag
*ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag
*ACE_30Rnd_65x47_Scenar_mag
*ACE_10Rnd_762x54_Tracer_mag
2015-04-14 22:19:51 +02:00
ulteq
f0a716fee8
Added new ammo classes:
...
*762x67mm Mk248 Mod 0
*762x67mm Mk248 Mod 1
*762x67mm Berger Hybrid OTM
*65x47mm Scenar
2015-04-14 22:17:27 +02:00
ulteq
33a06c5706
Updated stringtable
2015-04-13 21:36:47 +02:00
ulteq
2332f19274
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics
...
Conflicts:
addons/ballistics/stringtable.xml
addons/magazines/CfgAmmo.hpp
addons/magazines/CfgMagazines.hpp
addons/magazines/CfgVehicles.hpp
addons/magazines/CfgWeapons.hpp
addons/magazines/newclasses.txt
2015-04-13 21:35:53 +02:00
ulteq
8edb2d2c49
Complete overhaul of all ammo/magazine and weapon classes:
...
*Merged the magazines- into the ballistics module
*Adjusted all magazine class initSpeeds
*Adjusted all weapon class initSpeeds
2015-04-13 21:08:31 +02:00
ulteq
c12cc24a78
TABS:
...
* "kill them with fire"
* "then kill them again, with a rusty spoon"
2015-04-13 14:48:31 +02:00
ulteq
d8c23c2a64
Merged advanced_ballistics\CfgWeapons.cpp into ballistics\CfgWeapons.hpp
2015-04-13 14:46:21 +02:00
ulteq
6626379a25
Added new 1.42 config data
2015-04-08 23:07:26 +02:00
ulteq
b5b962bd4a
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into abIntegration
2015-04-07 20:59:37 +02:00
jaynus
1bb6be5654
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
esteldunedain
100686d34a
Move ballistic data outside the advance_ballistics pbo, so:
...
- it can be used by other pbos like overheating without it requiring ab.
- the tweaks to airfriction are available to basic wind_deflection too if ab is not present.
2015-04-05 20:05:04 -03:00
jaynus
8a18d18c08
doubleplusgood all munition TTL for range.
2015-04-02 16:35:19 -07:00
jaynus
b88d1b4cac
Begin time to live changes for extended range rounds.
2015-04-02 10:45:52 -07:00
commy2
6ca84c3d31
delete obsolete ammo configs
2015-03-29 14:25:13 +02:00
KoffeinFlummi
3e00ebd12b
Add README for ballistics
2015-01-26 07:36:45 +01:00
commy2
b9551f6ad8
split mags from ballistic
2015-01-20 22:40:15 +01:00
commy2
a1432e35d7
fix missing base class
2015-01-20 20:02:43 +01:00
commy2
7071f34131
split flashhiders and uniform/vest nerfs from ballistics
2015-01-20 19:55:17 +01:00
PabstMirror
614dced0fa
DEBUG_SETTINGS in script comps
2015-01-14 12:34:24 -06:00
bux578
de8ca47e88
change some core to common
2015-01-14 14:28:04 +01:00
commy2
5636721717
try to port that vector
2015-01-14 07:24:17 +01:00
commy2
0aa348133d
fix target wall texture path
2015-01-14 04:36:33 +01:00
commy2
9c99eee461
port ballistics
2015-01-14 04:02:48 +01:00
