Nicolás Badano 0c3c0b0e33 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 ...

Conflicts:
	addons/weather/XEH_postInit.sqf

2015-01-22 02:48:48 -03:00

..

ai

DEBUG_SETTINGS in script comps

2015-01-14 12:34:24 -06:00

aircraft

DEBUG_SETTINGS in script comps

2015-01-14 12:34:24 -06:00

attach

Standardize Config Version Stuff

2015-01-18 01:32:07 -06:00

backblast

backblast: completed port

2015-01-14 01:32:38 -03:00

ballistics

split mags from ballistic

2015-01-20 22:40:15 +01:00

common

Convert Old Ace_Options

2015-01-21 18:19:10 -06:00

difficulties

port difficulties

2015-01-18 08:06:25 +01:00

disposable

Standardize Config Version Stuff

2015-01-18 01:32:07 -06:00

explosives

Standardize Config Version Stuff

2015-01-18 01:32:07 -06:00

fcs

make some key events non blocking to allow some actions to share keybinds

2015-01-20 01:12:30 -03:00

flashsuppressors

split mags from ballistic

2015-01-20 22:40:15 +01:00

frag

Standardize Config Version Stuff

2015-01-18 01:32:07 -06:00

gforces

gforces: fix for when there's no player

2015-01-17 15:18:11 -03:00

goggles

Convert Old Ace_Options

2015-01-21 18:19:10 -06:00

grenades

Flashbang Icon Name

2015-01-17 12:12:02 -06:00

gui

Fixed incorrect parameters being given to callback function

2015-01-18 15:17:25 +01:00

hearing

Convert Old Ace_Options

2015-01-21 18:19:10 -06:00

interaction

interaction: fix canInteract and exceptions in agm menu

2015-01-20 02:58:06 -03:00

inventory

Standardize Config Version Stuff

2015-01-18 01:32:07 -06:00

kestrel

kestrel 360, weather

2015-01-22 00:22:09 +01:00

laser

Standardize Config Version Stuff

2015-01-18 01:32:07 -06:00

laser_selfdesignate

laser_selfdesginate commit for commanche

2015-01-19 20:13:12 -08:00

laserpointer

laserpointer: various improvements:

2015-01-17 23:51:31 -03:00

lockbackpacks

port lock backpacks

2015-01-18 07:56:09 +01:00

magazinerepack

port magazinerepack

2015-01-16 15:37:32 +01:00

magazines

split mags from ballistic

2015-01-20 22:40:15 +01:00

main

Set wind and rain syncing. Change ACE_wind from macro to global variable

2015-01-20 23:17:09 -03:00

map

map: small fixes

2015-01-17 16:04:48 -03:00

markers

Send marker configNames instead of index

2015-01-19 22:49:39 -06:00

missileguidance

function name error.

2015-01-19 20:19:33 -08:00

movement

stuff

2015-01-20 02:19:31 +01:00

nametags

Convert Old Ace_Options

2015-01-21 18:19:10 -06:00

nightvision

Standardize Config Version Stuff

2015-01-18 01:32:07 -06:00

noradio

noradio: ace local event for playerChanged

2015-01-16 12:14:40 -03:00

optionsmenu

Colors from config

2015-01-21 17:43:57 -06:00

overheating

overheating: cba keybinds

2015-01-18 17:08:56 -03:00

protection

split mags from ballistic

2015-01-20 22:40:15 +01:00

ragdolls

DEBUG_SETTINGS in script comps

2015-01-14 12:34:24 -06:00

realisticnames

DEBUG_SETTINGS in script comps

2015-01-14 12:34:24 -06:00

recoil

Standardize Config Version Stuff

2015-01-18 01:32:07 -06:00

reload

reload: cba keybinds

2015-01-18 17:05:32 -03:00

respawn

Standardize Config Version Stuff

2015-01-18 01:32:07 -06:00

resting

make some key events non blocking to allow some actions to share keybinds

2015-01-20 01:12:30 -03:00

safemode

fix for safemode

2015-01-18 17:56:12 -03:00

scopes

scopes: partial fix

2015-01-18 18:34:45 -03:00

smallarms

smallarms: port

2015-01-17 18:14:56 -03:00

switchunits

Standardize Config Version Stuff

2015-01-18 01:32:07 -06:00

thermals

DEBUG_SETTINGS in script comps

2015-01-14 12:34:24 -06:00

vector

CBA keybinding for vector

2015-01-21 23:49:16 +01:00

vehicles

vehicles: cba keybinds

2015-01-18 17:00:43 -03:00

weaponselect

weaponselect: replace keybinds for cba 2

2015-01-18 11:57:23 -03:00

weather

weather: small fix

2015-01-22 02:47:02 -03:00

wep_dragon

Standardize Config Version Stuff

2015-01-18 01:32:07 -06:00

wep_javelin

Javelin fixed and firing TDA terminal kill. Direct selection needs to be completed.

2015-01-21 21:31:58 -08:00