ACE3/addons at 46c041e6bcca061e6b4ba72d9f33d5084d83a16d - ACE3

mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00

History

PabstMirror 46c041e6bc Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

Conflicts:
	addons/attach/functions/fnc_getChildrenAttachActions.sqf
	addons/common/functions/fnc_dumpArray.sqf
	addons/common/functions/fnc_removeAllEventHandlers.sqf
	addons/common/functions/fnc_removeEventHandler.sqf
	addons/common/functions/fnc_serverEvent.sqf
	addons/common/functions/fnc_waitUntilAndExecute.sqf
	addons/explosives/functions/fnc_scriptedExplosive.sqf
	addons/finger/config.cpp
	addons/frag/config.cpp
	addons/interact_menu/functions/fnc_handlePlayerChanged.sqf
	addons/laser/functions/fnc_laserOn.sqf
	addons/laser/functions/fnc_seekerFindLaserSpot.sqf
	addons/laser/functions/fnc_unitTurretCanLockLaser.sqf
	addons/laser/functions/fnc_vanillaLaserSeekerHandler.sqf
	addons/laser_selfdesignate/functions/fnc_findLaserSource.sqf
	addons/laser_selfdesignate/functions/fnc_laserHudDesignateOff.sqf
	addons/main/config.cpp
	addons/main/script_mod.hpp
	addons/map/functions/fnc_flashlightGlow.sqf
	addons/maptools/functions/fnc_addLineMarker.sqf
	addons/maptools/functions/fnc_canDraw.sqf
	addons/maptools/functions/fnc_cancelDrawing.sqf
	addons/maptools/functions/fnc_copyMapReceiveMarkers.sqf
	addons/maptools/functions/fnc_copyMapRemoteSend.sqf
	addons/maptools/functions/fnc_copyMapStart.sqf
	addons/maptools/functions/fnc_handleKeyDown.sqf
	addons/maptools/functions/fnc_handleMouseZChanged.sqf
	addons/maptools/functions/fnc_removeLineMarker.sqf
	addons/maptools/functions/fnc_updateLineMarker.sqf
	addons/missileguidance/functions/fnc_checkLos.sqf
	addons/missileguidance/functions/fnc_checkSeekerAngle.sqf
	addons/overheating/CfgWeapons.hpp
	addons/overheating/functions/fnc_swapBarrelCallback.sqf
	addons/rearm/XEH_postInit.sqf
	addons/rearm/XEH_respawn.sqf
	addons/rearm/functions/fnc_canRearm.sqf
	addons/rearm/functions/fnc_dropAmmo.sqf
	addons/rearm/functions/fnc_getMaxMagazines.sqf
	addons/rearm/functions/fnc_grabAmmo.sqf
	addons/rearm/functions/fnc_pickUpAmmo.sqf
	addons/rearm/functions/fnc_rearmEntireVehicleSuccess.sqf
	addons/rearm/functions/fnc_rearmEntireVehicleSuccessLocal.sqf
	addons/rearm/functions/fnc_rearmSuccess.sqf
	addons/rearm/functions/fnc_rearmSuccessLocal.sqf
	addons/rearm/functions/fnc_storeAmmo.sqf
	addons/repair/functions/fnc_useItem.sqf
	addons/tagging/CfgVehicles.hpp
	addons/ui/ACE_UI.hpp
	optionals/tracers/config.cpp

2017-05-17 18:21:11 -05:00

advanced_ballistics

SQF Lint Cleanup Pass (#5157 )

2017-05-14 14:48:05 -05:00

advanced_fatigue

SQF Lint Cleanup Pass (#5157 )

2017-05-14 14:48:05 -05:00

advanced_throwing

SQF Lint Cleanup Pass (#5157 )

2017-05-14 14:48:05 -05:00

Remove CfgAiSkill config changes (#5091 )

2017-04-22 11:18:56 -05:00

aircraft

Disable aircraft flightmodel changes (#5167 )

2017-05-16 21:40:24 -05:00

apl

convert log macros to cba versions (#4282 )

2016-10-02 12:55:31 +02:00

atragmx

AtragMx: BC G1 .338LM API526 (#5069 )

2017-05-10 19:28:43 +02:00

attach

SQF Lint Cleanup Pass (#5157 )

2017-05-14 14:48:05 -05:00

backpacks

Add dev macro to quickly recompile functions (#4699 )

2016-11-23 13:35:25 -06:00

ballistics

French loc fixes (ballistics) (#5041 )

2017-03-26 19:39:05 -05:00

captives

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

cargo

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

chemlights

Improve Japanese translation (#5133 )

2017-05-06 12:01:31 -05:00

common

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

concertina_wire

Pass functions by "reference" to bis event handlers (#4898 )

2017-03-13 20:24:27 +01:00

cookoff

French localization complete (#5079 )

2017-04-12 10:39:41 +02:00

dagr

Fix dagr not showing bearing in mils (#5047 )

2017-03-30 10:02:13 -05:00

disarming

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

disposable

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

dogtags

French translation to "Advanced throwing" and "Advanced fatigue" (#4415 )

2017-03-13 20:25:09 +01:00

dragging

Increase max weapon index for large modsets (#5054 )

2017-05-12 13:12:39 -05:00

explosives

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

fastroping

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

fcs

1.70 FCS - Remove ACE_FCS from most vics (#5152 )

2017-05-16 00:36:22 +02:00

finger

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

flashlights

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

flashsuppressors

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

fonts

convert log macros to cba versions (#4282 )

2016-10-02 12:55:31 +02:00

frag

Switch 2 perm PFEH to everyFrame (#5140 )

2017-05-10 11:28:26 -05:00

gestures

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

gforces

Disable g-forces for UAV AI (#5094 )

2017-05-12 13:12:17 -05:00

goggles

Virtual units - skip goggles/hearing effects (#4988 )

2017-04-11 10:06:29 -05:00

grenades

French translation to "Advanced throwing" and "Advanced fatigue" (#4415 )

2017-03-13 20:25:09 +01:00

gunbag

Fix lost magazines when restoring gunbag mags (#4942 )

2017-03-13 20:39:24 +01:00

hearing

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

hitreactions

hitreactions - Close map on hit (#5099 )

2017-05-10 11:29:26 -05:00

huntir

Simplify huntIR configs using += (#4521 )

2017-01-09 12:11:31 -06:00

interact_menu

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

interaction

Add getInteractionDistance and fix VTOL refuel/arm (#4882 )

2017-03-13 20:19:51 +01:00

inventory

French translation to "Advanced throwing" and "Advanced fatigue" (#4415 )

2017-03-13 20:25:09 +01:00

javelin

Generic cycle attack profile key for missile guidance (#4787 )

2017-03-13 20:25:30 +01:00

kestrel4500

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

laser

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

laserpointer

Improve Japanese translation (#5133 )

2017-05-06 12:01:31 -05:00

logistics_uavbattery

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

logistics_wirecutter

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

magazinerepack

SQF Lint Cleanup Pass (#5157 )

2017-05-14 14:48:05 -05:00

main

Update required Arma 3 version to 1.70

2017-05-16 14:05:23 +02:00

map

SQF Lint Cleanup Pass (#5157 )

2017-05-14 14:48:05 -05:00

map_gestures

MapGesutres - Fix dependency on maptools (#5154 )

2017-05-11 14:02:21 -05:00

maptools

French localization complete (#5079 )

2017-04-12 10:39:41 +02:00

markers

French translation to "Advanced throwing" and "Advanced fatigue" (#4415 )

2017-03-13 20:25:09 +01:00

medical

Increase max weapon index for large modsets (#5054 )

2017-05-12 13:12:39 -05:00

medical_ai

French translation to "Advanced throwing" and "Advanced fatigue" (#4415 )

2017-03-13 20:25:09 +01:00

medical_blood

Improve Japanese translation (#5133 )

2017-05-06 12:01:31 -05:00

medical_menu

French loc improvement (#5017 )

2017-03-25 10:52:37 -05:00

microdagr

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

minedetector

SQF Lint Cleanup Pass (#5157 )

2017-05-14 14:48:05 -05:00

missileguidance

Fix Javelin for AI (#4857 )

2017-03-13 20:31:16 +01:00

missionmodules

Fix getPos order (#4889 )

2017-03-13 20:35:15 +01:00

mk6mortar

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

modules

fix win newline in repo (#4849 )

2017-01-23 00:56:52 +01:00

movement

Fix unarmed sprint->prone + minor perf improvments (#4887 )

2017-03-15 10:12:07 -05:00

mx2a

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

nametags

Cache Nametags onDraw3D flags. (#4847 )

2017-03-13 20:30:53 +01:00

nightvision

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

noidle

convert log macros to cba versions (#4282 )

2016-10-02 12:55:31 +02:00

noradio

convert log macros to cba versions (#4282 )

2016-10-02 12:55:31 +02:00

norearm

convert log macros to cba versions (#4282 )

2016-10-02 12:55:31 +02:00

optics

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

optionsmenu

fix highlighted info box color (#5075 )

2017-04-11 09:41:32 -05:00

overheating

Tweak overheating (#4969 )

2017-04-11 10:04:57 -05:00

overpressure

SQF Lint Cleanup Pass (#5157 )

2017-05-14 14:48:05 -05:00

parachute

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

rangecard

Fix rangecard not showing wind/lead (#4964 )

2017-03-13 20:42:05 +01:00

realisticnames

Fix gatling_30mm UBC for 1.70 (#5125 )

2017-05-16 00:46:02 +02:00

realisticweights

Update SMG_02 base class for 1.66 (#4718 )

2016-12-12 19:31:52 +01:00

rearm

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

recoil

Add dev macro to quickly recompile functions (#4699 )

2016-11-23 13:35:25 -06:00

refuel

SQF Lint Cleanup Pass (#5157 )

2017-05-14 14:48:05 -05:00

reload

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

reloadlaunchers

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

repair

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

respawn

Increase max weapon index for large modsets (#5054 )

2017-05-12 13:12:39 -05:00

safemode

Increase max weapon index for large modsets (#5054 )

2017-05-12 13:12:39 -05:00

sandbag

Sandbags surfaces update (#4971 )

2017-03-15 10:11:37 -05:00

scopes

French localization complete (#5079 )

2017-04-12 10:39:41 +02:00

slideshow

French localization complete (#5079 )

2017-04-12 10:39:41 +02:00

smallarms

Update SMG_02 base class for 1.66 (#4718 )

2016-12-12 19:31:52 +01:00

spectator

Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply

2017-05-17 18:21:11 -05:00

spottingscope

Fix Spotting Scope Interaction Point (#5132 )

2017-05-07 16:51:34 -05:00

switchunits

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

tacticalladder

Fixes #4814 (#4815 )

2017-01-11 15:54:03 -06:00

tagging

SQF Lint Cleanup Pass (#5157 )

2017-05-14 14:48:05 -05:00

thermals

convert log macros to cba versions (#4282 )

2016-10-02 12:55:31 +02:00

trenches

Sandbags surfaces update (#4971 )

2017-03-15 10:11:37 -05:00

tripod

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

French translation to "Advanced throwing" and "Advanced fatigue" (#4415 )

2017-03-13 20:25:09 +01:00

vector

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

vehiclelock

Fix vehicle lock lockpick condition, Fix lockpicking from inside (#4985 )

2017-03-13 20:43:55 +01:00

vehicles

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

viewdistance

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

weaponselect

Increase max weapon index for large modsets (#5054 )

2017-05-12 13:12:39 -05:00

weather

Switch 2 perm PFEH to everyFrame (#5140 )

2017-05-10 11:28:26 -05:00

winddeflection

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

yardage450

Korean Translation v1.0 (#4794 )

2017-01-02 17:52:01 -06:00

zeus

Zeus Suppression Module (#4977 )

2017-05-10 11:29:04 -05:00