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
ad67fca8f4
Update stringtable.xml
2015-04-15 17:45:48 +02:00
Ivan Navarro Cabello
40b784fb7a
update stringtable
...
added spanish translate
2015-04-15 17:41:10 +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
Legolasindar
bbc24b6d02
Update stringtable.xml
...
added spanish translate
2015-04-15 16:49:43 +02:00
commy2
9c1b40f5a3
preparing for improved positions of action points
2015-04-15 16:40:20 +02: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
commy2
bf8f9b4818
all I need is a $
2015-04-15 15:34:01 +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
commy2
eecf405fda
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 15:06:29 +02:00
ulteq
238cf1cc63
Added keybinds for ATragMX and Kestrel 4500 (empty by default)
2015-04-15 15:06:28 +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
KoffeinFlummi
21305629ed
Merge branch 'patch-1' of https://github.com/nomisum/ACE3 into german-merge
2015-04-15 14:53:27 +02:00
commy2
e3d1946924
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 14:37:49 +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
bc62891122
Update stringtable.xml
...
Italian
2015-04-15 11:24:20 +02:00
Marco
76ff1da57a
Update stringtable.xml
...
Italian
2015-04-15 11:19:54 +02:00
Marco
47f8161855
Update stringtable.xml
...
Italian
2015-04-15 11:18:22 +02:00
Marco
924cd80e60
Update stringtable.xml
...
ITalian
2015-04-15 11:13:47 +02:00
Marco
cb2e1c5116
Update stringtable.xml
...
Italian
2015-04-15 11:13:19 +02:00
Marco
5238647021
Update stringtable.xml
...
Italian
2015-04-15 11:12:15 +02:00
Marco
f931c1a42c
Update stringtable.xml
...
Italian
2015-04-15 11:10:05 +02:00
Marco
96be1baddc
Update stringtable.xml
...
Italian
2015-04-15 11:08:43 +02:00
Marco
8c0f52e615
Update stringtable.xml
...
Italian
2015-04-15 11:08:04 +02:00
Marco
d1936d8e1b
Update stringtable.xml
...
Italian
2015-04-15 11:06:42 +02:00
Marco
5c7b8247c5
Update stringtable.xml
...
Italian
2015-04-15 11:05:57 +02:00
Marco
6e7c1ce9d2
Update stringtable.xml
...
Ita
2015-04-15 11:04:18 +02:00
Marco
544894a05e
Update stringtable.xml
...
Italian
2015-04-15 10:59:44 +02:00
Marco
9a8dd905f2
Update stringtable.xml
2015-04-15 10:56:39 +02:00
Marco
eceb759523
Update stringtable.xml
...
Italian
2015-04-15 10:53:35 +02:00
Marco
b28ef3d22d
Update stringtable.xml
...
Italian
2015-04-15 10:52:40 +02:00
Marco
45fec0409d
Update stringtable.xml
...
Italian
2015-04-15 10:51:26 +02:00
Marco
c9e452a000
Update stringtable.xml
...
Italian
2015-04-15 10:48:52 +02:00
Marco
aaee9c72c1
Update stringtable.xml
...
Italian translation
2015-04-15 10:44:13 +02:00
Marco
f328d302e1
Update stringtable.xml
...
Italian translation
2015-04-15 10:42:25 +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
Marco
af3fdf9b91
Update stringtable.xml
...
Italian translation
2015-04-15 10:28:09 +02:00
commy2
09289fbf48
only on server though
2015-04-15 08:34:30 +02:00
commy2
6c4e50a98d
localized names for rallypoints, auto assign slot of group leader at the start of the mission as JIP persistant rallypoint mover slot
2015-04-15 08:31:40 +02:00
commy2
44fad81fe1
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 06:51:59 +02:00
esteldunedain
69aef53f5b
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-15 01:34:10 -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
PabstMirror
1f51a3fc8a
Never use this func anywhere
2015-04-14 23:10:05 -05:00
PabstMirror
428688422e
Missing stringtable for listMenu
2015-04-14 22:47:57 -05:00
commy2
d6a293c573
disable firing if menu is opened
2015-04-15 05:19:03 +02:00
esteldunedain
7ad9238bbf
Fixes
2015-04-14 23:32:03 -03:00
esteldunedain
c6c7ef7c79
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 23:22:35 -03:00
esteldunedain
c397246534
Fix the fov test. Issue not fixed
2015-04-14 23:22:08 -03:00
jaynus
57acee0f89
Changed: Cleaned up Missile guidance setting for AI, SCALAR.
2015-04-14 19:19:14 -07:00
esteldunedain
53ce7d0be4
Increase the tolerance to 2m
2015-04-14 23:12:48 -03:00
esteldunedain
7a606a2352
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 22:54:10 -03:00
esteldunedain
ee34078960
Add early visibility check to interact menu
2015-04-14 22:53:10 -03:00
PabstMirror
00b9e2d72c
draw3d
2015-04-14 20:49:44 -05:00
PabstMirror
91c8c89e87
Only sync A3 VON status over network
2015-04-14 20:47:07 -05:00
jaynus
b307b4bc4b
Fixed: Flummi missed 2 isClientSettable renames.
2015-04-14 18:38:52 -07:00
jaynus
ad95105508
Added and enabled AMG for AI.
2015-04-14 18:25:02 -07:00
jaynus
ef6d090238
Fixed: JAV_DIR was erroring.
2015-04-14 18:18:38 -07:00
jaynus
37de67395f
Fixed: issue where Javelin wouldn't hit > 1500
2015-04-14 18:18:27 -07:00
commy2
2940d1f83c
base rallypoints create a respawn marker if none is present in the mission
2015-04-15 03:10:17 +02:00
PabstMirror
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
commy2
e1926c6af1
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 02:12:16 +02:00
jaynus
b39209cc28
BAD @esteldunedain! BAD DOGGY!
2015-04-14 17:09:13 -07:00
commy2
29633d763a
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 02:05:55 +02:00
commy2
4cdf61ab9e
fix misc issues with rallypoints
2015-04-15 01:50:58 +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
Nicolás Badano
10b1587453
Merge pull request #592 from gienkov/master
...
PL translation
2015-04-14 20:36:25 -03:00
esteldunedain
88b78ad3ca
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 20:21:39 -03:00
esteldunedain
ee04ea2f41
Allow actions on coordinates instead of selections
2015-04-14 20:21:11 -03: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
jaynus
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
esteldunedain
2ff6eef792
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 19:18:08 -03:00
esteldunedain
ad750977e0
Fix ACRE volume on medical unconsciousness
2015-04-14 19:17:05 -03:00
jaynus
10bb77e738
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 15:11:55 -07:00
jaynus
c136b78fc8
rename 20mm
2015-04-14 15:11:49 -07:00
esteldunedain
495c822061
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 19:10:31 -03:00
esteldunedain
6f4bb48489
Merge branch 'master' into linearMenuExperiment
...
Conflicts:
addons/attach/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/overheating/stringtable.xml
extensions/CMakeLists.txt
2015-04-14 19:09:57 -03:00
commy2
7c5a6538a9
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 00:06:12 +02:00
jaynus
36ebb96531
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 14:58:29 -07:00
jaynus
85c10328ae
missed one.
2015-04-14 14:58:19 -07:00
Felix Wiegand
5d8dd701d2
Merge pull request #518 from acemod/basic-medical-tweaks
...
Basic medical tweaks
2015-04-14 23:49:00 +02:00
jaynus
df3c8155a0
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 14:45:30 -07:00
jaynus
c6943fbdaf
fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588
2015-04-14 14:45:21 -07:00
commy2
4c6cc8dddf
merging stringtables
2015-04-14 23:22:25 +02:00
KoffeinFlummi
9b80245479
Fix speed limiter not working
2015-04-14 23:13:02 +02:00
KoffeinFlummi
8b1bce3b3d
Merge branch 'master' of https://github.com/acemod/ACE3
2015-04-14 23:00:59 +02:00
KoffeinFlummi
9e64538bc7
Fix minor adjustment strings
2015-04-14 23:00:17 +02:00
KoffeinFlummi
f07949cf19
Remove some old todos
2015-04-14 22:57:18 +02:00
KoffeinFlummi
676f7c8732
Remove hitpart from action names for non-self
2015-04-14 22:50:06 +02:00
KoffeinFlummi
13d7649c4a
Buff colour flashing effect
2015-04-14 22:49:26 +02:00
KoffeinFlummi
2391c5e6d6
Tweak crate names
2015-04-14 22:34:19 +02:00
KoffeinFlummi
91e25dc215
Missing stringtable entries
2015-04-14 22:34:08 +02:00
ulteq
8aad369ed3
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-14 22:23:56 +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
KoffeinFlummi
7af6ea36a6
Fix missing pain effect option name
2015-04-14 22:07:43 +02:00
KoffeinFlummi
348bf611f8
Merge branch 'master' into basic-medical-tweaks
2015-04-14 21:55:45 +02:00
KoffeinFlummi
684c36f8a5
Add pain effect option
2015-04-14 21:49:56 +02:00
Nicolás Badano
462947a04c
Merge pull request #585 from acemod/fix-clientSetable
...
Fix spelling of "isClientSetable"
2015-04-14 16:48:50 -03:00
KoffeinFlummi
ebcdafe610
Fix spelling of "isClientSetable"
2015-04-14 21:43:19 +02:00
KoffeinFlummi
e7807c009f
Use playerInventoryChanged instead of Take
...
This makes sure to also fire when other mods, like TFAR (when adding
backpacks) add items via script.
2015-04-14 21:28:18 +02:00
Glowbal
af255604ac
Switched to event based sync system for open wounds
2015-04-14 21:17:36 +02:00
jaynus
2f2eab87e2
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 11:42:38 -07:00
jaynus
739807303b
Fix script error for canceling designation and dying while designating.
2015-04-14 11:42:26 -07:00
KoffeinFlummi
71b19b4621
Remove duplicate bleeding code
2015-04-14 20:40:38 +02:00
KoffeinFlummi
ba377dfd3a
Show seperate message for "scratches"; localize
2015-04-14 20:40:17 +02:00
KoffeinFlummi
c6118901b4
Merge branch 'master' into basic-medical-tweaks
2015-04-14 20:35:17 +02:00
KoffeinFlummi
7ca36cdb65
Always show wounds, even for very low damage
2015-04-14 20:28:19 +02:00
KoffeinFlummi
a4c93ab2e2
Add seperate crates for basic and advanced
2015-04-14 20:28:00 +02:00
KoffeinFlummi
c379f2775e
Style fixes
2015-04-14 20:27:42 +02:00
jaynus
0ae27d16c5
Merge pull request #580 from acemod/seeker_fov
...
Seeker FOV check optimizations
2015-04-14 11:19:00 -07:00
jaynus
24830f815f
random lock interval was causing phasing.
2015-04-14 11:18:16 -07:00
ulteq
cf7caf4549
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-14 20:18:03 +02:00
ulteq
837f155ad7
Fixed incorrect key handler return value
2015-04-14 20:17:54 +02:00
jaynus
1dd41a00ba
integration.
2015-04-14 10:51:53 -07:00
jaynus
226312c504
Merge remote-tracking branch 'origin/master' into seeker_fov
...
Conflicts:
addons/missileguidance/functions/fnc_checkSeekerAngle.sqf
2015-04-14 10:47:40 -07:00
jaynus
511ca860e0
Merge pull request #579 from acemod/moreJavelinLockingFixes
...
More javelin locking + UI fixes
2015-04-14 10:40:51 -07:00
jaynus
fb5b524023
Loosen DAGR curve
2015-04-14 10:39:00 -07:00
jaynus
f0940707be
Disable locking on unloaded. Closes #539
2015-04-14 10:27:37 -07:00
jaynus
6f3ce27894
Javelin refined, working, locking fixes, UI fixes, missile guidance rewrite
2015-04-14 10:25:08 -07:00
jaynus
c436541f1c
Reworked, fun fun.
2015-04-14 09:36:39 -07:00
jaynus
376f924999
Finish guidance rewrite.
2015-04-14 08:24:13 -07:00
Nicolás Badano
a93cb310d4
Merge pull request #513 from acemod/mainCleanup
...
ACE_Main major cleanup
2015-04-14 10:25:14 -03:00
esteldunedain
c827c72412
AB and Kestrel: Move macros from defines.h to script_component
2015-04-14 10:22:26 -03:00
KoffeinFlummi
57c526c04d
Merge branch 'master' of https://github.com/acemod/ACE3
2015-04-14 15:12:46 +02:00
KoffeinFlummi
c1fccecb21
Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge
2015-04-14 15:12:24 +02:00
Nicolás Badano
85d253cdc1
Merge pull request #574 from gienkov/master
...
Advanced Ballistics PL translation
2015-04-14 10:10:59 -03:00
KoffeinFlummi
b563bf8a8e
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00
KoffeinFlummi
63fe4118d4
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
commy2
ea7659a36e
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-14 13:36:02 +02:00
commy2
f89e02a5ca
fix no laser in ffv slots
2015-04-14 13:24:17 +02:00
commy2
83ce3fa2bd
remove drawline3d
2015-04-14 13:14:37 +02:00
ulteq
994071960c
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-14 12:52:30 +02:00
ulteq
1a39005e72
Removed debug output.
2015-04-14 12:52:21 +02:00
KoffeinFlummi
96319c8799
Merge https://github.com/ruPaladin/ACE3 into russian-merge
2015-04-14 12:50:14 +02:00
Coren4
83c8abb3ba
Update stringtable.xml
2015-04-14 12:41:35 +02:00
ulteq
44232987b0
Commented out deprecated icon paths
2015-04-14 12:34:27 +02:00
ulteq
3d558f376f
Fixed some icon path names
2015-04-14 12:16:29 +02:00
Grzegorz Sikora
1be197728e
AdvBal PL translation
2015-04-14 11:42:52 +02:00
ulteq
864a3c3cda
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500
...
Conflicts:
addons/weather/XEH_postInit.sqf
2015-04-14 11:14:27 +02:00
ulteq
5a7078ad2c
Removed a deprecated workaround
2015-04-14 11:12:58 +02:00
ulteq
9f0388fa12
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics
2015-04-14 11:09:38 +02:00
ulteq
983a36e52d
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX
2015-04-14 11:06:32 +02:00
ulteq
d931745f5c
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments
2015-04-14 11:02:37 +02:00
ulteq
2f39067cb3
Removed TABs
2015-04-14 10:47:09 +02:00
jaynus
22d90fee9a
Begin modelToWorld work.
2015-04-13 16:47:09 -07:00
jaynus
761fef39c8
working save.
2015-04-13 15:34:51 -07:00
commy2
3da3543381
toggle laser vs ir laser
2015-04-14 00:32:09 +02:00
Harakhti
e7e46b3b59
Translation: S to W
...
That's all I've found so far.
2015-04-14 00:05:39 +02:00
Harakhti
8bfd915ec4
Translation: N to R
...
This was a lot more fun than the previous two were. 12 folders left...
2015-04-13 23:45:44 +02:00
commy2
c95bd42a19
Merge pull request #548 from acemod/opticsfix
...
fix misc issues with optics, fix #537
2015-04-13 23:22:12 +02:00
ulteq
acc021c11c
Replaced TABs and newline braces
2015-04-13 23:10:55 +02:00
Harakhti
1b60a335a5
Translation: J to M
...
I feel burned out. This was very specifically long and tedious.
2015-04-13 23:03:09 +02:00
commy2
b72366f0f6
hide laser beam during day
2015-04-13 22:34:43 +02:00
commy2
ada62fca7d
reloading launchers didn't work on remote clients
2015-04-13 21:38:01 +02:00
ulteq
c2ac7fc547
Removed magazines module
2015-04-13 21:37:19 +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
1073f4e484
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX
...
Conflicts:
AUTHORS.txt
2015-04-13 21:33:12 +02:00
ulteq
032d745334
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments
2015-04-13 21:32:09 +02:00
ulteq
fa88ab484e
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500
...
Conflicts:
addons/kestrel/stringtable.xml
2015-04-13 21:31:04 +02:00
Nicolás Badano
db6361a086
Merge pull request #565 from Kllrt/master
...
Added another new CZ strings
2015-04-13 16:25:32 -03:00
ulteq
ea78a6325f
Changed the module setting defaults
2015-04-13 21:20:07 +02:00
ulteq
1b2691ff1c
Fixed incorrect calculation of the scope adjustment limits
2015-04-13 21:17:30 +02:00
Kllrt
1c611ba2db
Added another new CZ strings
2015-04-13 21:15:04 +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
commy2
804079cfae
manual merge
2015-04-13 20:20:55 +02:00
Harakhti
3c3f6ba4c3
Translation: A to I
...
Some parts filled out, other parts corrected or stylized.
2015-04-13 19:28:58 +02:00
commy2
bd168981e2
how do I merge
2015-04-13 19:23:42 +02:00
bux578
0e6eb46bb4
Merge pull request #560 from gienkov/master
...
Further PL translation fixes
2015-04-13 19:18:54 +02:00
commy2
fa64225e55
Merge pull request #505 from acemod/muteunit
...
Muteunit framework, fix #473
2015-04-13 19:18:45 +02:00
commy2
f48b6dc77a
Merge pull request #519 from acemod/marksmenai
...
increase engagement ranges / burst mode on new mmg / full auto dmr
2015-04-13 19:18:40 +02:00
Grzegorz
2cd456432e
Update stringtable.xml
2015-04-13 19:17:42 +02:00
Grzegorz
5269f32d62
weird but fixed
...
Something went wrong there, but fixed
2015-04-13 19:11:39 +02:00
jaynus
ff858c1194
Begin stateful guidance. Re-write of TOP down because it wasnt even running. LIN was default. but it was broken anyways.
2015-04-13 09:56:15 -07:00
jaynus
e5d8fe2634
Guidance timing per FPS fixes.
2015-04-13 09:24:28 -07:00
jaynus
3e7c8ca634
remove optic debug.
2015-04-13 09:03:19 -07:00
Grzegorz Sikora
ac886828b0
Fixes
2015-04-13 18:02:48 +02:00
jaynus
6aa9f5bcbc
NFOV/WFOV
2015-04-13 09:01:18 -07:00
