jaynus 01535c7f5c Merge remote-tracking branch 'origin/master' into allTheMissiles ...

Conflicts:
	addons/wep_javelin/config.cpp

2015-04-09 12:41:09 -07:00

..

ai

…

aircraft

…

attach

…

backpacks

…

ballistics

…

captives

…

common

Merge branch 'master' into tools-cleanup

2015-04-09 13:37:19 +02:00

difficulties

…

disposable

…

dragging

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

explosives

…

fcs

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

flashsuppressors

…

frag

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

gforces

…

goggles

…

grenades

…

hearing

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

hitreactions

prevent ai fro being stuck, #290

2015-04-09 16:54:50 +02:00

interact_menu

Merge pull request #277 from KoffeinFlummi/revert-276-revert-272-142menudeploy

2015-04-08 13:26:05 -05:00

interaction

…

inventory

…

kestrel

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

laser

Fixes: Laser designator now uses strongest ray result.

2015-04-08 08:48:08 -07:00

laser_selfdesignate

Merge remote-tracking branch 'origin/master' into allTheMissiles

2015-04-09 12:41:09 -07:00

laserpointer

…

logistics_uavbattery

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

logistics_wirecutter

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

magazinerepack

…

magazines

…

main

Merge pull request #274 from KoffeinFlummi/142requiredaddons

2015-04-08 13:21:33 -05:00

map

Merge pull request #392 from KoffeinFlummi/requiredaddons

2015-04-09 16:37:47 +02:00

maptools

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

markers

Fix Marker Placement on UAV Map

2015-04-08 13:55:29 -05:00

medical

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

microdagr

…

missileguidance

Merge remote-tracking branch 'origin/master' into allTheMissiles

2015-04-09 12:41:09 -07:00

missionmodules

…

modules

…

movement

…

nametags

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

nightvision

…

noidle

…

noradio

…

norearm

…

optics

another undef to Make PBO-Project Happy

2015-04-08 18:20:00 -05:00

optionsmenu

#386 - Ace Options Menu on main menu

2015-04-08 10:33:12 -05:00

overheating

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

overpressure

…

parachute

…

protection

manual merge

2015-04-08 22:01:41 +02:00

ragdolls

…

realisticnames

…

reload

…

reloadlaunchers

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

respawn

…

safemode

…

scopes

Merge branch 'master' of github.com:KoffeinFlummi/ACE3

2015-04-09 09:32:58 -03:00

smallarms

…

switchunits

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

testmissions

…

thermals

…

vector

…

vehiclelock

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00

vehicles

…

weaponselect

…

weather

…

wep_javelin

Config expansion.

2015-04-09 09:39:23 -07:00

winddeflection

sorting out required addons for modularity

2015-04-09 13:23:29 +02:00