Commit Graph

10095 Commits

Author SHA1 Message Date
commy2
5047d95086 add some authors 2016-06-26 00:23:43 +02:00
commy2
9eba2fe940 add russian rank icons 2016-06-26 00:02:19 +02:00
commy2
e88ecfc236 add function for custom rank icons displayed below nametags 2016-06-25 21:25:03 +02:00
Glowbal
8f3907c03f Merge branch 'release' 2016-06-25 11:43:49 +02:00
Glowbal
6e6929be4d Merge pull request #3985 from acemod/fixLeadIndicatorForBluAA
Fix lead indicator for B_APC_Tracked_01_AA_F
2016-06-25 11:40:51 +02:00
Glowbal
fc876ce316 Merge pull request #3986 from acemod/fixSekerLos
missleGuidance - Fix seeker los check
2016-06-25 11:40:15 +02:00
Glowbal
9874911ca1 Merge pull request #3982 from acemod/update-required-cba-version
Increase required CBA version
2016-06-25 11:39:48 +02:00
Glowbal
a76b00d699 Merge branch 'release' into update-required-cba-version 2016-06-25 11:38:30 +02:00
Glowbal
8ac7e94436 Merge pull request #3981 from acemod/updateCBAinTools
Update cba in tools
2016-06-25 11:38:13 +02:00
Glowbal
ec6f3879c0 Merge pull request #3978 from J3aLeiNe/patch-2
Update compat_r3f config.cpp
2016-06-25 11:37:50 +02:00
Glowbal
4cfbb22e90 Merge pull request #3979 from J3aLeiNe/patch-3
Update compat_r3f CfgAmmo.hpp
2016-06-25 11:37:31 +02:00
Glowbal
2f627f57a5 Merge pull request #3977 from J3aLeiNe/patch-1
Update fnc_getMapData.sqf
2016-06-25 11:37:17 +02:00
PabstMirror
a18e46c1c9 missleGuidance - Fix seeker los check
Close #3374
Because func was undefined _losOkay was nil, so target leading was
always skipped.
2016-06-25 01:27:23 -05:00
J3aLeiNe
75396ce63e Update fnc_getMapData.sqf
No Gitexit for Lingor. Stay with us Lingor ! :p
2016-06-25 08:21:21 +02:00
PabstMirror
5589ef2bb8 Fix Target lead indication for B_APC_Tracked_01_AA_F 2016-06-25 00:13:07 -05:00
Glowbal
7f7671d5ca Update required arma3 version 2016-06-24 20:58:45 +02:00
Glowbal
37c4351340 Increase required CBA version 2016-06-24 20:56:57 +02:00
J3aLeiNe
8e7282a46a Add OFP maps by CWR2 team
- Add OFP maps by CWR2 team included in the last CUP terrains update
 - Fix latitude according to the Bohemia Wiki
2016-06-24 19:47:44 +02:00
PabstMirror
d5c3334719 Update CBA included in tools 2016-06-24 12:16:12 -05:00
Glowbal
8d451354f8 Merge pull request #3975 from acemod/cba-add-player-eh
convert common events to CBA playerEvents, target: release branch
2016-06-22 17:44:54 +02:00
commy2
4368c6afc6 Merge branch 'release' into cba-add-player-eh 2016-06-22 17:37:50 +02:00
J3aLeiNe
7d74331328 Update CfgAmmo.hpp
Fix correct "ACE_barrelLengths" for "R3F_127x99_Ball" and "R3F_127x99_PEI" according to the R3F_PGM_Hecate_II barrel length (700mm)
2016-06-22 17:24:09 +02:00
J3aLeiNe
08aa518e68 Update config.cpp
Add correct requiredAddons entries since the last @R3F_ARMES update
2016-06-22 16:55:19 +02:00
J3aLeiNe
6a92b43b1d Update fnc_getMapData.sqf
Add maps and fix latitude :
 - Kidal, latitude 18° (default latitude 0°)
 - Governor´s Island, latitude 41° (default latitude -34°)
 - Doung island (Unsung Mod), latitude 10° (default latitude -10°)
 - Dakrong (Unsung Mod), latitude 16° (default latitude -16°)
 - Pecher map, latitude 43° (default latitude -34°)

Remove obsolete Arma2 Lingor map

and fix my illiterate mistakes ...
2016-06-22 16:36:53 +02:00
commy2
08886f413c change remaining ace events to CBA 'addPlayerEventHandler' 2016-06-22 11:16:55 +02:00
commy2
047ac8c3f2 Merge pull request #3973 from acemod/eventWrappers
Convert state checking to CBA playerEH
2016-06-22 10:53:47 +02:00
commy2
bd41260fa8 add a missing 'private' 2016-06-22 10:46:04 +02:00
Glowbal
cea77fb331 Merge pull request #3974 from acemod/master
Move towards 3.6.0 release
2016-06-22 09:51:15 +02:00
PabstMirror
fad44e38a6 Convert state checking to CBA playerEH 2016-06-21 19:31:25 -05:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
Glowbal
e298f5c71b Merge pull request #3970 from acemod/fixMineUBC
fix mine ubc
2016-06-21 19:40:04 +02:00
PabstMirror
af6aaf6e7d fix mine ubc 2016-06-21 12:24:31 -05:00
Glowbal
6abe937488 Update extensions 2016-06-21 18:17:24 +02:00
Glowbal
eef2bb060a Update readme version mentions 2016-06-21 18:09:15 +02:00
Glowbal
284231fe21 3.6.0 2016-06-21 18:07:27 +02:00
Glowbal
e357ca3ca8 Merge pull request #3963 from acemod/fix_ace_requiring_patched_stock_classes
fix some rogue mission dependencies
2016-06-21 17:59:25 +02:00
Glowbal
ee58df9c34 bump minor version 2016-06-21 17:57:50 +02:00
Glowbal
cd3d7c8e24 Merge pull request #3961 from acemod/undefinedCleanup
Cleanup some undefined functions and strings
2016-06-21 17:57:02 +02:00
commy2
bf098ec70e fix some rogue mission dependencies, fix #3954 2016-06-20 21:07:10 +02:00
PabstMirror
fe5dd3fe76 Cleanup some undefined functions and strings 2016-06-20 13:58:37 -05:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name
add 'name' to components
2016-06-20 19:25:58 +02:00
Glowbal
38df85bccc Merge pull request #3958 from acemod/fix3950
Fix freeing prisoners after they've switched locality
2016-06-20 17:21:11 +02:00
commy2
653a371652 Merge pull request #3960 from acemod/beautify-names
Added beautified component names
2016-06-20 12:38:38 +02:00
commy2
750efbfdd8 fix spelling "Name Tags" 2016-06-20 12:34:30 +02:00
commy2
2249ef5e1c fix spelling "Laser Pointer" 2016-06-20 12:34:03 +02:00
commy2
ae5fe8af3c fix spelling "Wire Cutter" 2016-06-20 12:33:10 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
commy2
2dbcd5c183 Merge pull request #3959 from acemod/shorter-component-name
Change component name to ACE3
2016-06-20 10:54:58 +02:00
Glowbal
e540134de1 Change component name to ACE3 2016-06-20 09:57:27 +02:00
Glowbal
afb9eb3084 Merge pull request #3342 from acemod/vehicleInteractionDistance
Uniformize interaction distance for vehicle based on bounding box
2016-06-20 09:55:55 +02:00