ACE3/addons at af48c6a86cbbb6da536459e75b8d0e4d0036e501 - ACE3

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

History

PabstMirror af48c6a86c Merge branch 'master' into medical-rewrite

Conflicts:
	addons/medical/ACE_Medical_SelfActions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/XEH_PREP.hpp
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical_treatment/functions/fnc_actionLoadUnit.sqf

2017-10-02 22:29:30 -05:00

advanced_ballistics

AdvancedBallistics - Utilize 'parseSimpleArray' (#5496 )

2017-09-16 11:08:25 +02:00

advanced_fatigue

Merge branch 'master' into medical-rewrite

2017-09-23 11:25:58 -05:00

advanced_throwing

Underwater actions support (#4984 )

2017-08-22 13:30:56 -05:00

Remove CfgAiSkill config changes (#5091 )

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

aircraft

Replace Helicopter eject configs with universal scripted action (#5384 )

2017-09-18 00:24:14 +02:00

apl

Replace UI icons with vanilla/common ones (#5532 )

2017-09-21 16:22:28 +02:00

atragmx

Use CBA Misc Items (#5502 )

2017-09-12 23:23:45 -05:00

attach

Use CBA Misc Items (#5502 )

2017-09-12 23:23:45 -05:00

backpacks

Conform function headers to coding guidelines (#5255 )

2017-06-08 15:31:51 +02:00

ballistics

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

captives

Italian translation update (#5576 )

2017-10-01 10:56:02 -05:00

cargo

Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521 )

2017-10-01 13:38:11 -05:00

chemlights

Cleanup optional argument headers (#5543 )

2017-09-22 17:33:08 +02:00

common

Merge branch 'master' into medical-rewrite

2017-10-02 22:29:30 -05:00

concertina_wire

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

cookoff

Merge remote-tracking branch 'sbng/master'

2017-09-27 18:57:24 +02:00

dagr

Use CBA Misc Items (#5502 )

2017-09-12 23:23:45 -05:00

disarming

Cleanup optional argument headers (#5543 )

2017-09-22 17:33:08 +02:00

disposable

Replace UI icons with vanilla/common ones (#5532 )

2017-09-21 16:22:28 +02:00

dogtags

Use CBA Misc Items (#5502 )

2017-09-12 23:23:45 -05:00

dragging

Merge branch 'master' into medical-rewrite

2017-10-02 22:29:30 -05:00

explosives

Add trip flare to Put muzzle (#5564 )

2017-09-28 03:46:33 +02:00

fastroping

Update the Japanese translation (#5565 )

2017-09-28 16:04:24 +02:00

fcs

Common func to run config tests (#5170 )

2017-08-22 16:21:41 -05:00

finger

Underwater actions support (#4984 )

2017-08-22 13:30:56 -05:00

flashlights

Typo in flashlights translation Fix #5552 (#5553 )

2017-09-25 16:29:40 +02:00

flashsuppressors

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

fonts

Cleanup (#5463 )

2017-08-29 17:47:01 -05:00

frag

Merge remote-tracking branch 'sbng/master'

2017-09-27 18:57:24 +02:00

gestures

Underwater actions support (#4984 )

2017-08-22 13:30:56 -05:00

gforces

Merge branch 'master' into medical-rewrite

2017-09-23 11:25:58 -05:00

goggles

Compatibility with newest mikro tools (#5442 )

2017-08-22 12:53:58 -05:00

grenades

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

gunbag

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

hearing

Cleanup optional argument headers (#5543 )

2017-09-22 17:33:08 +02:00

hellfire

Move the hellfire hud to the laser module (#5503 )

2017-09-16 14:24:43 -05:00

hitreactions

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

huntir

Use CBA Misc Items (#5502 )

2017-09-12 23:23:45 -05:00

interact_menu

Medical & Captive Load Menu Overhaul (#5519 )

2017-09-29 22:00:47 +02:00

interaction

Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521 )

2017-10-01 13:38:11 -05:00

inventory

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

javelin

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

kestrel4500

Kestrel4500 - Fixed head- and crosswind calculation (#5489 )

2017-09-10 15:16:17 +02:00

laser

Cleanup optional argument headers (#5543 )

2017-09-22 17:33:08 +02:00

laserpointer

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

logistics_uavbattery

Merge remote-tracking branch 'sbng/master'

2017-09-27 18:57:24 +02:00

logistics_wirecutter

Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521 )

2017-10-01 13:38:11 -05:00

magazinerepack

Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521 )

2017-10-01 13:38:11 -05:00

main

Merge remote-tracking branch 'sbng/master'

2017-09-27 18:57:24 +02:00

map

Re enable all markers (except civ and quantity) (#5376 )

2017-09-18 11:18:02 -05:00

map_gestures

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

maptools

Use CBA Misc Items (#5502 )

2017-09-12 23:23:45 -05:00

markers

Italian translation update (#5531 )

2017-09-19 16:22:11 +02:00

maverick

Update the Jpn translation (#5536 )

2017-09-20 14:59:46 +02:00

medical

Merge branch 'master' into medical-rewrite

2017-10-02 22:29:30 -05:00

medical_ai

Merge branch 'master' into medical-rewrite

2017-09-27 15:48:22 -05:00

medical_blood

Merge branch 'master' into medical-rewrite

2017-09-27 15:48:22 -05:00

medical_damage

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

medical_engine

Fix setUnconsciousAnim error

2017-09-23 11:46:48 -05:00

medical_menu

Merge branch 'master' into medical-rewrite

2017-10-02 22:29:30 -05:00

medical_treatment

Merge branch 'master' into medical-rewrite

2017-10-02 22:29:30 -05:00

medical_ui

Add load,unload and radial actions (#5270 )

2017-06-15 14:35:33 -05:00

microdagr

Merge remote-tracking branch 'sbng/master'

2017-09-27 18:57:24 +02:00

minedetector

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

missileguidance

Merge remote-tracking branch 'sbng/master'

2017-09-27 18:57:24 +02:00

missionmodules

Fix Chinese content & missing string (#5375 )

2017-07-19 20:57:20 +02:00

mk6mortar

Cleanup optional argument headers (#5543 )

2017-09-22 17:33:08 +02:00

modules

Add XEH to ace_module (#5304 )

2017-07-10 16:46:02 +02:00

movement

Merge remote-tracking branch 'sbng/master'

2017-09-27 18:57:24 +02:00

mx2a

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

nametags

Fix Chinese content & missing string (#5375 )

2017-07-19 20:57:20 +02:00

nightvision

Add fast mouse actions to refuel, add refuel eden attributes (#5418 )

2017-09-10 14:43:03 -05:00

nlaw

Merge branch 'release'

2017-07-18 23:00:48 +02:00

noidle

Cleanup (#5463 )

2017-08-29 17:47:01 -05:00

noradio

Cleanup (#5463 )

2017-08-29 17:47:01 -05:00

norearm

Cleanup (#5463 )

2017-08-29 17:47:01 -05:00

optics

Cleanup (#5463 )

2017-08-29 17:47:01 -05:00

optionsmenu

Fix Chinese content & missing string (#5375 )

2017-07-19 20:57:20 +02:00

overheating

Replace UI icons with vanilla/common ones (#5532 )

2017-09-21 16:22:28 +02:00

overpressure

Merge branch 'master' into medical-rewrite

2017-09-23 11:25:58 -05:00

parachute

Fix Chinese content & missing string (#5375 )

2017-07-19 20:57:20 +02:00

quickmount

Replace UI icons with vanilla/common ones (#5532 )

2017-09-21 16:22:28 +02:00

rangecard

RangeCard - Always display barrel length and bore height (#5551 )

2017-09-26 16:51:48 +02:00

realisticnames

Maverick L (laser guided AGM) (#5364 )

2017-09-16 22:25:20 +02:00

realisticweights

Update SMG_02 base class for 1.66 (#4718 )

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

rearm

Minor rearm fixes (#5572 )

2017-09-30 11:14:41 -05:00

recoil

Conform function headers to coding guidelines (#5255 )

2017-06-08 15:31:51 +02:00

refuel

Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521 )

2017-10-01 13:38:11 -05:00

reload

Update the Japanese translation (#5565 )

2017-09-28 16:04:24 +02:00

reloadlaunchers

Underwater actions support (#4984 )

2017-08-22 13:30:56 -05:00

repair

Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521 )

2017-10-01 13:38:11 -05:00

respawn

Update the Japanese translation (#5565 )

2017-09-28 16:04:24 +02:00

safemode

Underwater actions support (#4984 )

2017-08-22 13:30:56 -05:00

sandbag

Use CBA Misc Items (#5502 )

2017-09-12 23:23:45 -05:00

scopes

Underwater actions support (#4984 )

2017-08-22 13:30:56 -05:00

slideshow

Fix Chinese content & missing string (#5375 )

2017-07-19 20:57:20 +02:00

smallarms

Update SMG_02 base class for 1.66 (#4718 )

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

spectator

Italian translation update (#5531 )

2017-09-19 16:22:11 +02:00

spottingscope

Use CBA Misc Items (#5502 )

2017-09-12 23:23:45 -05:00

switchunits

Update the Japanese translation (#5565 )

2017-09-28 16:04:24 +02:00

tacticalladder

Fix unconscious handlers run globally (#5504 )

2017-09-12 18:10:49 -05:00

tagging

Use CBA Misc Items (#5502 )

2017-09-12 23:23:45 -05:00

thermals

Cleanup (#5463 )

2017-08-29 17:47:01 -05:00

trenches

Use CBA Misc Items (#5502 )

2017-09-12 23:23:45 -05:00

tripod

Use CBA Misc Items (#5502 )

2017-09-12 23:23:45 -05:00

Fix Chinese content & missing string (#5375 )

2017-07-19 20:57:20 +02:00

vector

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

vehiclelock

Use CBA Misc Items (#5502 )

2017-09-12 23:23:45 -05:00

vehicles

Underwater actions support (#4984 )

2017-08-22 13:30:56 -05:00

viewdistance

Fixed viewdistance error while controlling UAV (#5308 )

2017-09-10 14:42:19 -05:00

weaponselect

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

weather

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

winddeflection

Merge remote-tracking branch 'sbng/master'

2017-09-27 18:57:24 +02:00

yardage450

Correct new Chinese stringtable identifiers (#5334 )

2017-07-10 16:47:26 +02:00

zeus

Merge branch 'master' into medical-rewrite

2017-10-02 22:29:30 -05:00