Commit Graph

2602 Commits

Author SHA1 Message Date
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
64d6bbaf26 Fixed an incorrect BC in an ATragMX gun profile 2015-04-15 18:55:20 +02:00
98d0c06ce3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 16:22:50 +02:00
95b04d0840 Added custom airFriction values for the new marksmen ammo types. 2015-04-15 16:22:42 +02:00
6710040633 toLower in, always follow your own advice 2015-04-15 16:13:53 +02:00
250d6acb22 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 2015-04-15 16:09:40 +02:00
1fc546a700 Merge branch 'polish-merge' 2015-04-15 15:10:41 +02:00
79934cfb78 Merge https://github.com/Coren4/ACE3 into polish-merge 2015-04-15 15:10:28 +02:00
1e326c17ad Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 15:06:35 +02:00
238cf1cc63 Added keybinds for ATragMX and Kestrel 4500 (empty by default) 2015-04-15 15:06:28 +02:00
69489df910 Merge pull request #610 from ramius86/patch-3
Update stringtable.xml
2015-04-15 09:57:27 -03:00
527385e6e1 Merge pull request #609 from ramius86/patch-2
Update stringtable.xml
2015-04-15 09:57:15 -03:00
21305629ed Merge branch 'patch-1' of https://github.com/nomisum/ACE3 into german-merge 2015-04-15 14:53:27 +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
9f289e1721 Fixed incorrect return values in some key handlers:
*Wind info
*Protractor
2015-04-15 12:53:02 +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
2daa0e2d29 Update stringtable.xml
Italian translation
2015-04-15 10:32:01 +02:00
532ee16411 Update stringtable.xml
Italian translation
2015-04-15 10:30:56 +02:00
69aef53f5b Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-15 01:34:10 -03:00
25e8e93fd0 Add back stringtables for the list menu 2015-04-15 01:32:42 -03:00
d7a0503dbc Merge pull request #600 from acemod/lmbmenu
disable firing if menu is opened, fix #368, close #483
2015-04-15 01:29:39 -03:00
5faf4b7dfa Remove comment 2015-04-15 01:27:29 -03:00
a36739c697 Merge pull request #418 from acemod/flashbangTweaks
Flashbang tweaks
2015-04-14 23:23:15 -05:00
a9f44530c9 Move the function that prevents firing while the interact_menu is open to the interact_menu pbo 2015-04-15 01:20:20 -03:00
428688422e Missing stringtable for listMenu 2015-04-14 22:47:57 -05:00
d6a293c573 disable firing if menu is opened 2015-04-15 05:19:03 +02:00
7ad9238bbf Fixes 2015-04-14 23:32:03 -03:00
c6c7ef7c79 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 23:22:35 -03:00
c397246534 Fix the fov test. Issue not fixed 2015-04-14 23:22:08 -03:00
57acee0f89 Changed: Cleaned up Missile guidance setting for AI, SCALAR. 2015-04-14 19:19:14 -07:00
53ce7d0be4 Increase the tolerance to 2m 2015-04-14 23:12:48 -03:00
7a606a2352 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 22:54:10 -03:00
ee34078960 Add early visibility check to interact menu 2015-04-14 22:53:10 -03:00
b307b4bc4b Fixed: Flummi missed 2 isClientSettable renames. 2015-04-14 18:38:52 -07:00
ad95105508 Added and enabled AMG for AI. 2015-04-14 18:25:02 -07:00
ef6d090238 Fixed: JAV_DIR was erroring. 2015-04-14 18:18:38 -07:00
37de67395f Fixed: issue where Javelin wouldn't hit > 1500 2015-04-14 18:18:27 -07:00
1488ba2aac #595 - Hide ace optino button if no world loaded
I wanted to use a rscMapControl onDraw, but it throws an error
onMouseMoving seems odd, but it works and I don't have to overload
onLoad
2015-04-14 19:52:35 -05:00
b39209cc28 BAD @esteldunedain! BAD DOGGY! 2015-04-14 17:09:13 -07:00
d538cd257c PL translation fix
Typo, wrote Mk248 Mod 0, should be Mk248 Mod 1
2015-04-15 01:44:33 +02:00
10b1587453 Merge pull request #592 from gienkov/master
PL translation
2015-04-14 20:36:25 -03:00
88b78ad3ca Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 20:21:39 -03:00
ee04ea2f41 Allow actions on coordinates instead of selections 2015-04-14 20:21:11 -03: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
81e61e2f04 Added non-radio speaking event to ACRE isSpeaking functionality. Why is this propegating a setVariable every speaking event though? ACRE already propegates that. Closes #591 2015-04-14 15:30:04 -07:00
2ff6eef792 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 19:18:08 -03:00
ad750977e0 Fix ACRE volume on medical unconsciousness 2015-04-14 19:17:05 -03:00