Commit Graph

10152 Commits

Author SHA1 Message Date
jonpas
b99b11d066 Merge branch 'master' into armake 2016-06-28 18:29:51 +02:00
Glowbal
419b525458 Fix incorrect macro syntax
Syntax caused pboProject to choke
2016-06-27 19:30:39 +02:00
Glowbal
a9f3c2f784 Merge pull request #4012 from acemod/fix-medical-config-typo
Fix incorrect values for bandage configuration
2016-06-27 19:07:34 +02:00
Glowbal
d7965233d9 Merge pull request #4010 from acemod/rearmHandleNil
rearm - Skip selectWeapon on nil
2016-06-27 19:05:37 +02:00
Glowbal
0844e311a5 Merge pull request #4008 from acemod/cleanupWaitAndExec
Switch EFUNC(common,waitAndExecute) to CBA
2016-06-27 19:03:24 +02:00
Glowbal
3928d8a2cb Merge pull request #4005 from acemod/tagUpward
Align tags upward in non-horizontal surfaces
2016-06-27 19:03:08 +02:00
Glowbal
c287223a08 Fix incorrect values for bandage configuration 2016-06-27 19:01:33 +02:00
PabstMirror
8bd3332b0e rearm - Skip selectWeapon on nil
Should fix #4006
2016-06-27 00:00:25 -05:00
PabstMirror
10a19b59e7 Swich EFUNC(common,waitAndExecute) to CBA 2016-06-26 22:18:53 -05:00
esteldunedain
d6d6ed7674 Make it work properly and support ceilings 2016-06-26 20:17:51 -03:00
esteldunedain
18fd198d1e If the surface is not horizontal create _v2 pointing upward instead of away 2016-06-26 20:02:14 -03:00
Glowbal
21c4efcbba Merge pull request #4004 from acemod/custom-rank-icons-function
add function for custom rank icons displayed below nametags
2016-06-26 10:57:49 +02:00
Glowbal
c2578a3694 Merge pull request #3995 from acemod/russian-rank-icons
add Russian rank icons
2016-06-26 10:53:54 +02:00
Glowbal
2a46099063 Merge pull request #4003 from acemod/disable-auto-weather
Disable auto weather
2016-06-26 10:51:38 +02:00
Glowbal
c2db7cfa14 Merge pull request #4002 from acemod/fingerCleanup
ACE_Finger cleanup
2016-06-26 10:51:26 +02:00
Glowbal
badb3fa943 Merge branch 'release' into fingerCleanup 2016-06-26 10:49:54 +02:00
Glowbal
b84b532cfb Merge pull request #4001 from acemod/renameEvents
Rename events
2016-06-26 10:47:39 +02:00
Glowbal
52f8def590 Merge pull request #3991 from acemod/uavFCS
Block FCS when controlling a UAV
2016-06-26 10:47:19 +02:00
Glowbal
7b42d9ea84 Merge pull request #3996 from acemod/nightDirt
Make dirt/dust effects less bright at night
2016-06-26 10:47:03 +02:00
PabstMirror
5a92aaeb28 Make dirt/dust effects less bright at night
Fix #1447
2016-06-25 19:02:07 -05:00
commy2
4a19f9b1af update russian rank icons 2016-06-26 01:01:03 +02:00
commy2
4e0fb4d171 give the iranians their ranks back 2016-06-26 00:35:56 +02:00
commy2
66abb0b103 add russian ranks to more factions 2016-06-26 00:29:17 +02:00
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
1db1c41072 only disable auto-weather settings by default, but keep them toggleable 2016-06-25 21:46:24 +02:00
commy2
e88ecfc236 add function for custom rank icons displayed below nametags 2016-06-25 21:25:03 +02:00
esteldunedain
0160ee81a6 - ACE_Finger cleanup
- Allow pointing to nearby positions
2016-06-25 16:02:06 -03:00
commy2
3690519a7c disable auto weather - bugging out ACE weather 2016-06-25 20:39:06 +02:00
Glowbal
3aebbdd269 Merge pull request #3984 from acemod/fixLoadoutWhenNull
Handle "loadout" changed event when player is null
2016-06-25 12:28:54 +02:00
Glowbal
f171ef8e16 Merge branch 'release' into fixLoadoutWhenNull 2016-06-25 12:25:23 +02:00
commy2
f2a9a5c058 Merge pull request #3987 from acemod/use-backpack-command
Change use backpack command for backpack classname
2016-06-25 12:23:58 +02:00
Glowbal
af61c2bc50 Remove unused parameter
Gear is no longer used and can be removed from fthe function parameters
2016-06-25 12:23:07 +02:00
Glowbal
5fef1ba384 Change use backpack command for backpack classname
Uses the backpack command to retrieve the classname of a unit's backpack instead of a select. Fixes incorrect index.
2016-06-25 12:03:44 +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
PabstMirror
c3710cc7f9 Handle "loadout" changed event when player is null 2016-06-24 23:32:32 -05:00
PabstMirror
618d3a2e96 Block FCS when controlling a UAV
Fix doing FCS keyUp calculations/setVariable
when controlling a UAV while also in a turret with FCS enabled.

Normal rangefinder on the UAV will still work as FUNC(canUseRangefinder)
is still true
2016-06-24 16:53:13 -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