SilentSpike 159937dc45 Merge branch 'master' into ace_spectator ...

Conflicts:
	addons/explosives/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/stringtable.xml
	addons/medical/stringtable.xml
	addons/sitting/stringtable.xml
	addons/spectator/stringtable.xml
	extras/assets/icons/Icons_Modules.psd

2015-07-26 14:15:24 +01:00

..

advanced_ballistics

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

ai

Fixed Capitalized folders on include paths

2015-05-20 23:28:10 +02:00

aircraft

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

apl

Merge pull request #1493 from acemod/tacticalladder

2015-06-13 09:37:41 +02:00

atragmx

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

attach

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

backpacks

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

ballistics

Translation to Brazilian Portuguese (PT-BR)

2015-06-27 15:48:39 -03:00

captives

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

common

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

concertina_wire

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

dagr

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

difficulties

Create README.md

2015-01-26 13:37:41 +01:00

disarming

Merge branch 'master' into macroSTR

2015-06-02 22:14:32 +02:00

disposable

Applied ESTRING and ECSTRING macros

2015-05-27 22:04:41 +02:00

dragging

CZ - Translation

2015-06-12 15:05:04 +02:00

explosives

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

fcs

Macroize all stringtables

2015-06-05 21:02:24 -05:00

flashsuppressors

Correcting some spacing

2015-06-24 17:09:43 +01:00

fonts

Fixed: Font config breaking checkPBO

2015-05-20 10:42:24 -07:00

frag

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

gforces

All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.

2015-05-21 09:42:44 -07:00

goggles

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

grenades

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

hearing

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

hitreactions

HitReactions - Don't do when mounted, add setting

2015-05-31 16:16:14 -05:00

huntir

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

interact_menu

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

interaction

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

inventory

Merge branch 'master' into macroSTR

2015-06-02 22:14:32 +02:00

javelin

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

kestrel4500

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

laser

Fixed IS_STRING error due to regex replacing it with LSTRING

2015-05-30 20:09:53 +02:00

laser_selfdesignate

Macro STRING to LSTRING

2015-05-28 21:59:04 +02:00

laserpointer

Merge pull request #1541 from jonpas/sitting

2015-06-26 21:34:34 +02:00

logistics_uavbattery

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

logistics_wirecutter

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

magazinerepack

Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting

2015-06-13 22:08:13 +02:00

main

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

map

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

maptools

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

markers

Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting

2015-06-13 22:08:13 +02:00

medical

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

microdagr

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

missileguidance

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

missionmodules

Translation to Brazilian Portuguese (PT-BR)

2015-06-27 15:48:39 -03:00

mk6mortar

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

modules

Ace_modules - Pass synced objects to functions

2015-07-01 01:53:15 -05:00

movement

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

mx2a

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

nametags

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

nightvision

Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting

2015-06-13 22:08:13 +02:00

noidle

…

noradio

Correcting some spacing

2015-06-24 17:09:43 +01:00

norearm

hide rearm action for players

2015-03-26 14:14:56 +01:00

optics

Merge branch 'master' into macroSTR

2015-05-30 19:54:32 +02:00

optionsmenu

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

overheating

Allow certain self-interactions while sitting

2015-06-09 16:17:05 +02:00

overpressure

Fixed Capitalized folders on include paths

2015-05-20 23:28:10 +02:00

parachute

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

protection

Fix 1.44 Updating Base Class

2015-05-05 10:46:56 -05:00

ragdolls

Fixed Capitalized folders on include paths

2015-05-20 23:28:10 +02:00

rangecard

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

realisticnames

CZ - Translation

2015-06-12 14:50:50 +02:00

recoil

Removed debug output

2015-04-28 19:33:00 +02:00

reload

Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting

2015-06-13 22:08:13 +02:00

reloadlaunchers

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

respawn

#1699 - Rally point object names

2015-07-01 01:27:06 -05:00

safemode

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

sandbag

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

scopes

Allow certain self-interactions while sitting

2015-06-09 16:17:05 +02:00

sitting

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

slideshow

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

smallarms

Cleaning up of all tabs in source code files.

2015-04-06 09:22:43 -07:00

spectator

GVAR typo

2015-07-26 13:13:46 +01:00

spottingscope

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

switchunits

Merge branch 'master' into ace_spectator

2015-07-04 18:53:20 +01:00

tacticalladder

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

testmissions

Fixed Capitalized folders on include paths

2015-05-20 23:28:10 +02:00

thermals

Fixed Capitalized folders on include paths

2015-05-20 23:28:10 +02:00

tripod

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

ui

Added ace_ui - enchanced chat visibility on the map screen

2015-05-16 15:28:59 +02:00

vector

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

vehiclelock

Translation to Brazilian Portuguese (PT-BR)

2015-06-27 15:48:39 -03:00

vehicles

Macro STRING to LSTRING

2015-05-28 21:59:04 +02:00

viewdistance

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

weaponselect

#1208 - Holster key also unholsters

2015-06-07 12:59:53 -05:00

weather

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

winddeflection

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

yardage450

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

zeus

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00