Commit Graph

149 Commits

Author SHA1 Message Date
31a2f1b279 Russian translations
Again, filling strings, fixing errors
2015-04-17 19:36:07 +03:00
b80ec3f790 ballistics russian fixes + multilanguage fix 2015-04-17 15:57:25 +03:00
61d1e6854e added spanish translation
added spanish translation to ballistics and respawn
2015-04-16 19:03:15 +02:00
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
ca3293aa1a Added ACE_Box_Ammo (WIP):
*TODO: Define a model
2015-04-16 13:43:41 +02:00
aa724129d1 Tuned down the default timeToLive value. 2015-04-16 10:51:33 +02:00
c0c5af2957 ballistics - fix ubc 2015-04-15 17:07:06 -05:00
0b7ceea64e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 22:50:19 +02:00
60c54733cc Polished the ammo classes some more 2015-04-15 22:49:47 +02:00
550c32e801 French : update stringtable 2015-04-15 20:53:41 +02:00
3a062a4ff9 Fixed incorrect Mk319 Mod 0 BC/airFriction 2015-04-15 20:33:11 +02:00
3cff85e85d Added Mk319 Mod 0 ammo and magazines 2015-04-15 19:51:34 +02:00
396bd3954e Fixed a typo 2015-04-15 19:04:41 +02:00
0c4734637b Fixed the GM6 barrel length and updated the magazines array 2015-04-15 19:00:14 +02:00
f8061922f7 Added ACE_10Rnd_338_API526_Mag, ACE_5Rnd_127x99_Mag, ACE_5Rnd_127x99_AMAX_Mag 2015-04-15 18:59:41 +02:00
e0c34f22bf Added ACE_338_Ball_API526 and updated some airFriction values 2015-04-15 18:59:11 +02:00
40b784fb7a update stringtable
added spanish translate
2015-04-15 17:41:10 +02:00
95b04d0840 Added custom airFriction values for the new marksmen ammo types. 2015-04-15 16:22:42 +02:00
8b915380b7 Merge branch 'hungarian-merge' 2015-04-15 13:55:02 +02:00
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
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
bd5ed13621 Added ACE_65x39_Caseless_green_Tracer_Dim 2015-04-15 12:27:20 +02:00
d538cd257c PL translation fix
Typo, wrote Mk248 Mod 0, should be Mk248 Mod 1
2015-04-15 01:44:33 +02:00
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
035ed573b8 Reworked the magazine configs 2015-04-14 22:23:36 +02:00
1d64b8c36e Added the new magazines into various ammo boxes 2015-04-14 22:22:36 +02:00
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
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
33a06c5706 Updated stringtable 2015-04-13 21:36:47 +02:00
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
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
c12cc24a78 TABS:
* "kill them with fire"
* "then kill them again, with a rusty spoon"
2015-04-13 14:48:31 +02:00
d8c23c2a64 Merged advanced_ballistics\CfgWeapons.cpp into ballistics\CfgWeapons.hpp 2015-04-13 14:46:21 +02:00
6626379a25 Added new 1.42 config data 2015-04-08 23:07:26 +02:00
b5b962bd4a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into abIntegration 2015-04-07 20:59:37 +02:00
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
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
8a18d18c08 doubleplusgood all munition TTL for range. 2015-04-02 16:35:19 -07:00
b88d1b4cac Begin time to live changes for extended range rounds. 2015-04-02 10:45:52 -07:00
6ca84c3d31 delete obsolete ammo configs 2015-03-29 14:25:13 +02:00
3e00ebd12b Add README for ballistics 2015-01-26 07:36:45 +01:00
b9551f6ad8 split mags from ballistic 2015-01-20 22:40:15 +01:00
a1432e35d7 fix missing base class 2015-01-20 20:02:43 +01:00
7071f34131 split flashhiders and uniform/vest nerfs from ballistics 2015-01-20 19:55:17 +01:00
614dced0fa DEBUG_SETTINGS in script comps 2015-01-14 12:34:24 -06:00
de8ca47e88 change some core to common 2015-01-14 14:28:04 +01:00
5636721717 try to port that vector 2015-01-14 07:24:17 +01:00
0aa348133d fix target wall texture path 2015-01-14 04:36:33 +01:00
9c99eee461 port ballistics 2015-01-14 04:02:48 +01:00