jaynus
2e3545f3d0
Merge branch 'master' of github.com:acemod/ACE3
2015-04-15 09:55:48 -07:00
jaynus
ea2281616e
Enable all variants of Titan. Can now vanilla-lock in cadet mode.
2015-04-15 09:55:40 -07:00
PabstMirror
e84689a771
#544 - Change ERROR warning to debug trace
2015-04-15 11:46:06 -05:00
bux578
8ca4a8a932
Merge pull request #625 from ramius86/patch-8
...
Update AUTHORS.txt
2015-04-15 18:46:16 +02:00
Nicolás Badano
fecb2f37c0
Merge pull request #621 from ruPaladin/patch-5
...
Kestrel 4500NV translation to Russian
2015-04-15 13:28:44 -03:00
Nicolás Badano
0a6604a94f
Merge pull request #622 from ruPaladin/patch-6
...
addons/interact_menu translation to Russian
2015-04-15 13:28:33 -03:00
jaynus
a5700540bb
Merge pull request #623 from ruPaladin/patch-7
...
addons/weather/ translation to Russian
2015-04-15 09:28:04 -07:00
Nicolás Badano
7589b8b13d
Merge pull request #626 from ruPaladin/patch-11
...
addons/medical translation to Russian
2015-04-15 13:27:22 -03:00
jaynus
5923f246fd
Fixed: only exit on shooter.
2015-04-15 09:25:19 -07:00
jaynus
c793df4848
Changed: Safety mode on Titan, it now doesnt show as unloaded Fixed: Some TOP shots would miss, Fixed: Lock constraints would show on fast weapon switch.
2015-04-15 09:10:00 -07:00
ruPaladin
a3965424b9
addons/medical translation to Russian
2015-04-15 19:09:10 +03:00
Marco
ead2b1f064
Update AUTHORS.txt
2015-04-15 17:52:12 +02:00
ruPaladin
9caba1e3a3
addons/weather/ translation to Russian
2015-04-15 18:29:38 +03:00
ruPaladin
64504a9515
addons/interact_menu translation to Russian
2015-04-15 18:27:28 +03:00
ruPaladin
6fca601759
Kestrel 4500NV translation to Russian
2015-04-15 18:24:57 +03:00
jaynus
0d28a890e1
Fixes: Cycle fire mode on Titan was not working. Closes #603
2015-04-15 08:19:21 -07:00
ulteq
98d0c06ce3
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-15 16:22:50 +02:00
ulteq
95b04d0840
Added custom airFriction values for the new marksmen ammo types.
2015-04-15 16:22:42 +02:00
commy2
6710040633
toLower in, always follow your own advice
2015-04-15 16:13:53 +02:00
KoffeinFlummi
250d6acb22
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
2015-04-15 16:09:40 +02:00
KoffeinFlummi
def6c9135b
Fix typos in devenv doc
2015-04-15 15:31:10 +02:00
KoffeinFlummi
1fc546a700
Merge branch 'polish-merge'
2015-04-15 15:10:41 +02:00
KoffeinFlummi
79934cfb78
Merge https://github.com/Coren4/ACE3 into polish-merge
2015-04-15 15:10:28 +02:00
ulteq
1e326c17ad
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-15 15:06:35 +02:00
ulteq
238cf1cc63
Added keybinds for ATragMX and Kestrel 4500 (empty by default)
2015-04-15 15:06:28 +02:00
Coren4
9b94692ca5
Update AUTHORS.txt
2015-04-15 15:02:36 +02:00
Nicolás Badano
69489df910
Merge pull request #610 from ramius86/patch-3
...
Update stringtable.xml
2015-04-15 09:57:27 -03:00
Nicolás Badano
527385e6e1
Merge pull request #609 from ramius86/patch-2
...
Update stringtable.xml
2015-04-15 09:57:15 -03:00
Felix Wiegand
3032c84eda
Merge pull request #577 from nomisum/patch-3
...
added myself to authors.txt as requested
2015-04-15 14:54:15 +02:00
KoffeinFlummi
21305629ed
Merge branch 'patch-1' of https://github.com/nomisum/ACE3 into german-merge
2015-04-15 14:53:27 +02:00
KoffeinFlummi
8f94bbfec8
Make stringtableduplicates.py more useful
2015-04-15 13:55:07 +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
9f289e1721
Fixed incorrect return values in some key handlers:
...
*Wind info
*Protractor
2015-04-15 12:53:02 +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
Marco
2daa0e2d29
Update stringtable.xml
...
Italian translation
2015-04-15 10:32:01 +02:00
Marco
532ee16411
Update stringtable.xml
...
Italian translation
2015-04-15 10:30:56 +02:00
Nicolás Badano
6f07460d1d
Merge pull request #604 from firefly2442/patch-1
...
minor spelling fixes in feature requests documentation
2015-04-15 02:08:26 -03:00
Patrick
d0f4fb8de2
Update how-to-make-a-feature-request.md
...
minor spelling fixes
2015-04-14 23:50:48 -05:00
esteldunedain
69aef53f5b
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-15 01:34:10 -03:00
esteldunedain
c226d49ab9
Merge branch 'lmbmenu'
...
Conflicts:
addons/interact_menu/stringtable.xml
2015-04-15 01:33:44 -03:00
esteldunedain
25e8e93fd0
Add back stringtables for the list menu
2015-04-15 01:32:42 -03:00
Nicolás Badano
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
esteldunedain
5faf4b7dfa
Remove comment
2015-04-15 01:27:29 -03:00
PabstMirror
a36739c697
Merge pull request #418 from acemod/flashbangTweaks
...
Flashbang tweaks
2015-04-14 23:23:15 -05:00
esteldunedain
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
jaynus
a0199c0e3f
Merge pull request #601 from firefly2442/cmake-fix
...
match to exact directory name (case-sensitive)
2015-04-14 21:03:20 -07:00
PabstMirror
428688422e
Missing stringtable for listMenu
2015-04-14 22:47:57 -05:00
firefly2442
c81fa61f2e
match to exact directory name (case-sensitive)
2015-04-14 22:34:58 -05:00
