esteldunedain c423e9d743 Merge remote-tracking branch 'origin/medicalFixes' into simpleDiagnosis ...

Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/ACE_Medical_SelfActions.hpp

2015-04-17 20:02:51 -03:00

..

advanced_ballistics

Merge branch 'spanish-merge'

2015-04-16 18:32:37 +02:00

ai

increase engagement ranges / burst mode on new mmg / full auto dmr

2015-04-12 18:21:28 +02:00

aircraft

Fixed: Tabs everywhere.

2015-04-17 07:30:55 -07:00

atragmx

Got rid of the __DSP macro

2015-04-16 19:52:20 +02:00

attach

Some missing private defines.

2015-04-16 12:36:16 -05:00

backpacks

Some missing private defines.

2015-04-16 12:36:16 -05:00

ballistics

added spanish translation

2015-04-16 19:03:15 +02:00

captives

one more russian fix

2015-04-17 12:01:01 +03:00

common

fixed AI standing up before being killed

2015-04-17 21:06:30 +02:00

difficulties

…

disarming

Some missing private defines.

2015-04-16 12:36:16 -05:00

disposable

disposable cleanup, fix #696

2015-04-17 12:28:06 +02:00

dragging

Changed, only drop unit is player goes unconscious, otherwise keep carrying/dragging unit

2015-04-17 20:33:13 +02:00

explosives

Stringtable cleanup

2015-04-16 02:54:50 -05:00

fcs

Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge

2015-04-15 12:59:56 +02:00

flashsuppressors

Fixes

2015-04-13 18:02:48 +02:00

frag

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

gforces

…

goggles

Merge branch 'hungarian-merge'

2015-04-15 13:55:02 +02:00

grenades

Merge branch 'hungarian-merge'

2015-04-15 13:55:02 +02:00

hearing

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

hitreactions

…

interact_menu

Allow to dynamically modify actions at runtime. An optional code entry called modifierFunction can be added. That code is called before evaluating the action, allowing to dynamically change the actions name, icon, etc

2015-04-16 23:53:54 -03:00

interaction

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

inventory

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

javelin

Merge https://github.com/Legolasindar/ACE3 into spanish-merge

2015-04-16 18:31:31 +02:00

kestrel4500

Merge https://github.com/Legolasindar/ACE3 into spanish-merge

2015-04-16 18:31:31 +02:00

laser

Seeker FOV implemented, fast FOV check.

2015-04-12 19:16:58 -07:00

laser_selfdesignate

#644 - Extra Space in macro

2015-04-15 20:30:09 -05:00

laserpointer

Merge https://github.com/Legolasindar/ACE3 into spanish-merge

2015-04-16 18:31:31 +02:00

logistics_uavbattery

Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge

2015-04-15 12:59:56 +02:00

logistics_wirecutter

Remove unnecessary cfgSounds

2015-04-16 22:10:33 -05:00

magazinerepack

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

main

Readd CfgModuleCategories.hpp

2015-04-12 11:06:25 -03:00

map

…

maptools

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

markers

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

medical

Merge remote-tracking branch 'origin/medicalFixes' into simpleDiagnosis

2015-04-17 20:02:51 -03:00

microdagr

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

missileguidance

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

missionmodules

…

modules

…

movement

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

nametags

Merge https://github.com/ramius86/ACE3 into italian-merge

2015-04-17 15:44:50 +02:00

nightvision

Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge

2015-04-15 12:59:56 +02:00

noidle

…

noradio

mute implementation in noradio, handle post init on remote units

2015-04-12 11:17:58 +02:00

norearm

…

optics

Fixed: Tabs everywhere.

2015-04-17 07:30:55 -07:00

optionsmenu

Merge https://github.com/ramius86/ACE3 into italian-merge

2015-04-17 15:44:50 +02:00

overheating

Update stringtable.xml

2015-04-15 19:52:29 +03:00

overpressure

…

parachute

Merge branch 'master' of https://github.com/acemod/ACE3

2015-04-17 15:45:22 +02:00

protection

…

ragdolls

…

realisticnames

addons/realisticnames translation to Russian

2015-04-16 14:10:48 +03:00

reload

Update stringtable.xml

2015-04-16 10:25:39 +02:00

reloadlaunchers

Update stringtable.xml

2015-04-16 10:24:17 +02:00

respawn

Merge https://github.com/ramius86/ACE3 into italian-merge

2015-04-17 15:44:50 +02:00

safemode

Update stringtable.xml

2015-04-16 10:22:32 +02:00

scopes

Merge https://github.com/ramius86/ACE3 into italian-merge

2015-04-17 15:44:50 +02:00

smallarms

…

switchunits

Update stringtable.xml

2015-04-16 10:19:43 +02:00

testmissions

…

thermals

…

vector

how do I merge

2015-04-13 19:23:42 +02:00

vehiclelock

Merge https://github.com/ramius86/ACE3 into italian-merge

2015-04-17 15:44:50 +02:00

vehicles

Merge branch 'hungarian-merge'

2015-04-15 13:55:02 +02:00

weaponselect

Merge https://github.com/ramius86/ACE3 into italian-merge

2015-04-17 15:44:50 +02:00

weather

Merge https://github.com/ramius86/ACE3 into italian-merge

2015-04-17 15:44:50 +02:00

winddeflection

Merge https://github.com/ramius86/ACE3 into italian-merge

2015-04-17 15:44:50 +02:00