a5b88d3276
Merge pull request #4034 from acemod/dragKeybind
...
Add Drag/Drop Keybind
2016-07-03 20:43:06 +02:00
0a5a4d2d33
Fix German word order / capitalization
2016-07-03 20:42:43 +02:00
5ad1f752ca
Fix overheating spare barrels
...
- Remove ACE_SpareBarrel from CfgWeapons as it is now a magazine
- Don't call updateTemperature in displayTemp, as unit may not be local
- Fix targetEvent error
2016-07-03 12:58:40 -05:00
82f63b5935
Update showHud func for 1.62 (squad radar)
2016-07-03 12:17:42 -05:00
287adb16e6
Merge pull request #4040 from acemod/fixObscuedInteractionPoints
...
Less aggressive overlap detection
2016-07-03 17:33:10 +02:00
bbc708e3e0
Less aggressive overlap detection
...
Ensure the 2d screen pos distance is significant.
2016-07-02 22:46:36 -05:00
f2359cb243
Merge pull request #4037 from acemod/fixCargoSpareParts
...
Fix cargo event name - spare parts not being added
2016-07-02 14:19:23 +02:00
d15330d245
Fix cargo event name - spare parts not being added
2016-07-01 23:14:20 -05:00
96efbaef53
Add Drag/Drop Keybind
2016-07-01 16:28:44 -05:00
e3f96b6594
Merge branch 'master' into merge-basic-and-advanced
...
Conflicts:
addons/medical/XEH_postInit.sqf
addons/medical/functions/fnc_displayPatientInformation.sqf
2016-06-30 11:27:51 +02:00
cd08e00c71
Merge pull request #3962 from acemod/dogtags
...
Dogtags
2016-06-29 22:19:02 +02:00
a497690bbd
Merge branch 'master' into apex
2016-06-29 21:44:15 +02:00
a47168e31b
Merge pull request #4019 from acemod/customizable-faction
...
add possibility to overwrite a units faction for determining name tags
2016-06-29 20:16:21 +02:00
eca5263df8
Merge pull request #3998 from acemod/apexUBC
...
Fix UBC for 1.62 Apex
2016-06-29 12:04:21 +02:00
806877492c
Merge pull request #3999 from acemod/fixApexWeapons
...
Fix ballisitics and huntir configs
2016-06-29 12:04:05 +02:00
2fa8141721
Merge pull request #4022 from acemod/apexLauncherConfig
...
Add javelin configs for new apex launchers
2016-06-29 12:03:37 +02:00
3ae8a494c4
Add javelin configs for new apex launchers
...
Fix #4007
2016-06-28 22:46:04 -05:00
ab2307996c
add possibility to overwrite a units faction for determining name tags
2016-06-28 23:43:34 +02:00
01c184b174
Merge pull request #4014 from acemod/apexTitanBandaid
...
Handle bad target when using apex titans
2016-06-28 22:01:12 +02:00
4251831e2e
Merge pull request #4009 from acemod/fixRearmEvents
...
Fix rearm events
2016-06-28 20:33:56 +02:00
898217a533
Fixed popping and stray particles
2016-06-28 19:23:47 +02:00
20376385ca
Fix #4007 - Handle bad target when using apex titans
2016-06-27 13:43:05 -05:00
f1bf5f8e7b
Merge pull request #4013 from acemod/fix-color-medicaldisplay
...
Fix injuries shown as blue instead of red
2016-06-27 19:57:52 +02:00
1d66d46501
Fix damaged array not being overwritten.
...
This fixes an issue were injured body parts were displayed as blue instead of red. Happens when using advanced medical with AI running in basic mode.
2016-06-27 19:55:00 +02:00
419b525458
Fix incorrect macro syntax
...
Syntax caused pboProject to choke
2016-06-27 19:30:39 +02:00
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
d7965233d9
Merge pull request #4010 from acemod/rearmHandleNil
...
rearm - Skip selectWeapon on nil
2016-06-27 19:05:37 +02:00
8809881a9e
Merge branch 'release' into fixRearmEvents
2016-06-27 19:04:32 +02:00
0844e311a5
Merge pull request #4008 from acemod/cleanupWaitAndExec
...
Switch EFUNC(common,waitAndExecute) to CBA
2016-06-27 19:03:24 +02:00
3928d8a2cb
Merge pull request #4005 from acemod/tagUpward
...
Align tags upward in non-horizontal surfaces
2016-06-27 19:03:08 +02:00
c287223a08
Fix incorrect values for bandage configuration
2016-06-27 19:01:33 +02:00
8bd3332b0e
rearm - Skip selectWeapon on nil
...
Should fix #4006
2016-06-27 00:00:25 -05:00
8ecd8a49cc
Fix rearm events
2016-06-26 23:37:23 -05:00
10a19b59e7
Swich EFUNC(common,waitAndExecute) to CBA
2016-06-26 22:18:53 -05:00
d6d6ed7674
Make it work properly and support ceilings
2016-06-26 20:17:51 -03:00
18fd198d1e
If the surface is not horizontal create _v2 pointing upward instead of away
2016-06-26 20:02:14 -03:00
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
c2578a3694
Merge pull request #3995 from acemod/russian-rank-icons
...
add Russian rank icons
2016-06-26 10:53:54 +02:00
2a46099063
Merge pull request #4003 from acemod/disable-auto-weather
...
Disable auto weather
2016-06-26 10:51:38 +02:00
c2db7cfa14
Merge pull request #4002 from acemod/fingerCleanup
...
ACE_Finger cleanup
2016-06-26 10:51:26 +02:00
badb3fa943
Merge branch 'release' into fingerCleanup
2016-06-26 10:49:54 +02:00
b84b532cfb
Merge pull request #4001 from acemod/renameEvents
...
Rename events
2016-06-26 10:47:39 +02:00
52f8def590
Merge pull request #3991 from acemod/uavFCS
...
Block FCS when controlling a UAV
2016-06-26 10:47:19 +02:00
7b42d9ea84
Merge pull request #3996 from acemod/nightDirt
...
Make dirt/dust effects less bright at night
2016-06-26 10:47:03 +02:00
0ff0185359
Fix ballisitics and huntir configs
2016-06-25 21:57:42 -05:00
ed0823e40f
Fix UBC for 1.62 Apex
2016-06-25 21:07:30 -05:00
5108ffe20c
Add goggles setting for level of effects
...
Can chose between none, tint/colorCC/ and full dust/dirt/rain/rotorwash
2016-06-25 19:16:26 -05:00
5a92aaeb28
Make dirt/dust effects less bright at night
...
Fix #1447
2016-06-25 19:02:07 -05:00
4a19f9b1af
update russian rank icons
2016-06-26 01:01:03 +02:00
4e0fb4d171
give the iranians their ranks back
2016-06-26 00:35:56 +02:00
