jonpas 03f26fc12b Merge branch 'master' into uiSettings ...

Conflicts:
	addons/ui/README.md
	addons/ui/RscChat.hpp
	addons/ui/config.cpp

2015-10-08 00:06:41 +02:00

..

advanced_ballistics

Fixes to spanish translations

2015-09-18 13:36:57 -03:00

ai

Fixed Capitalized folders on include paths

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

aircraft

Revert "disable a10 tracers, commanche tracers only nvg"

2015-09-15 21:25:01 +02:00

apl

README.md files added to all modules

2015-08-19 04:18:33 +02:00

atragmx

Merge branch 'release' into french

2015-09-10 19:36:56 +02:00

attach

#2541 - Attach getIn/Out run on local unit

2015-09-21 22:50:48 -05:00

backpacks

Code cleanup Backpacks

2015-09-26 20:29:08 +02:00

ballistics

Merge branch 'release' into russian

2015-09-10 21:05:32 +02:00

captives

Give the event the D

2015-09-29 11:40:32 -05:00

cargo

#2664 - Disable loading into locked vehicles.

2015-10-03 19:42:40 -05:00

common

fix fnc_binocularMagazine on remote and dead units

2015-10-04 12:10:08 +02:00

concertina_wire

Merge branch 'release' into russian

2015-09-10 21:05:32 +02:00

dagr

Merge https://github.com/dudakov/ACE3 into russian-merge

2015-09-23 19:17:52 +02:00

difficulties

…

disarming

Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros

2015-09-15 14:51:23 +02:00

disposable

fix missing magazines after certain scenarios

2015-10-04 01:26:38 +02:00

dragging

pl string for dragging, tactical ladder

2015-09-29 22:12:11 +02:00

explosives

rework modifier key, cleanup sandbags, tripod, ladder, fix #2590

2015-09-26 03:16:55 +02:00

fcs

add fcs to static machine guns, close #1188

2015-09-17 14:40:58 +02:00

finger

Fixes to spanish translations

2015-09-18 13:36:57 -03:00

flashlights

Fixes to spanish translations

2015-09-18 13:36:57 -03:00

flashsuppressors

Correcting some spacing

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

fonts

README.md files added to all modules

2015-08-19 04:18:33 +02:00

frag

Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros

2015-09-15 14:51:23 +02:00

gforces

Cleanup more stuff

2015-09-18 14:24:20 -05:00

goggles

more goggles code cleanup

2015-09-30 01:31:45 +02:00

grenades

remove superfluous brackets

2015-09-26 22:42:47 +02:00

hearing

Merge https://github.com/dudakov/ACE3 into russian-merge

2015-09-23 19:17:52 +02:00

hitreactions

change description in function header

2015-09-26 21:27:00 +02:00

huntir

Merge pull request #2387 from acemod/FixHCPPE

2015-09-15 21:04:37 +02:00

interact_menu

Remove debug

2015-09-26 22:02:44 -05:00

interaction

manual merge

2015-09-28 21:06:40 +02:00

inventory

Merge branch 'release' into french

2015-09-10 19:36:56 +02:00

javelin

Update French translations

2015-09-10 19:14:51 +02:00

kestrel4500

README.md files added to all modules

2015-08-19 04:18:33 +02:00

laser

Switched to ACE_LOG<LEVEL>_# variation

2015-08-26 17:39:44 +02:00

laser_selfdesignate

Capitalization for macro CBA_fnc_addPerFrameHandler

2015-08-04 02:34:38 -05:00

laserpointer

Merge pull request #2387 from acemod/FixHCPPE

2015-09-15 21:04:37 +02:00

logistics_uavbattery

Readded items

2015-08-19 04:22:39 +02:00

logistics_wirecutter

Don't run when mounted

2015-08-23 22:55:43 -05:00

magazinerepack

Merge pull request #2173 from jokoho48/codeCleanupMagazineRepack

2015-08-21 14:09:55 +02:00

main

Macro for non spawned CBA Debug Logging

2015-09-25 22:30:57 -05:00

map

Merge branch 'release'

2015-09-21 17:14:53 -05:00

maptools

maptools - Remove debug

2015-09-19 20:42:46 -05:00

markers

Fix Colors + Debug Trace

2015-08-23 14:25:41 -05:00

medical

Merge remote-tracking branch 'origin/master' into pl-strings

2015-10-04 12:25:55 +02:00

medical_menu

#2672 - Use ACE_gameTime for triage card

2015-10-03 12:28:54 -05:00

microdagr

microDagr - Add ability to access draw event for minimap

2015-09-14 16:37:39 -05:00

missileguidance

Merge branch 'release' into russian

2015-09-10 21:05:32 +02:00

missionmodules

Merge branch 'release' into russian

2015-09-10 21:05:32 +02:00

mk6mortar

Merge branch 'master' into miscFixNilFunctions

2015-09-21 15:08:43 -05:00

modules

README.md files added to all modules

2015-08-19 04:18:33 +02:00

movement

Merge branch 'master' into ace_spectator

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

mx2a

Merge branch 'release' into russian

2015-09-10 21:05:32 +02:00

nametags

Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros

2015-09-15 14:51:23 +02:00

nightvision

Use _player instead of ACE_player

2015-09-18 12:48:59 -05:00

noidle

README.md files added to all modules

2015-08-19 04:18:33 +02:00

noradio

Code Cleanup NoRadio

2015-09-26 20:45:19 +02:00

norearm

README.md files added to all modules

2015-08-19 04:18:33 +02:00

optics

fix zeus forced interface broken, fix #2642

2015-09-29 02:48:22 +02:00

optionsmenu

Fixes to spanish translations

2015-09-18 13:36:57 -03:00

overheating

Merge pull request #2509 from acemod/miscFixNilFunctions

2015-09-21 20:36:09 -05:00

overpressure

Fixed incorrect handleDamage call

2015-09-19 11:52:35 +02:00

parachute

Fixes to spanish translations

2015-09-18 13:36:57 -03:00

ragdolls

README.md files added to all modules

2015-08-19 04:18:33 +02:00

rangecard

Fix some merging errors

2015-09-10 22:11:09 +02:00

realisticnames

Russian Translations - Update

2015-09-03 04:54:52 +03:00

recoil

README.md files added to all modules

2015-08-19 04:18:33 +02:00

reload

remove check ammo action on destroyed static weapons, fix #2671

2015-10-04 11:58:26 +02:00

reloadlaunchers

README.md files added to all modules

2015-08-19 04:18:33 +02:00

repair

Merge https://github.com/dudakov/ACE3 into russian-merge

2015-09-23 19:17:52 +02:00

respawn

Merge pull request #2679 from acemod/340missingmags

2015-10-04 11:46:36 +02:00

safemode

Code Cleanup SafetyMode

2015-09-27 08:28:55 +02:00

sandbag

rework modifier key, cleanup sandbags, tripod, ladder, fix #2590

2015-09-26 03:16:55 +02:00

scopes

Cleanup more stuff

2015-09-18 14:24:20 -05:00

sitting

Merge branch 'release'

2015-09-15 16:16:10 -05:00

slideshow

Change may to must in slideshow error log

2015-09-28 16:02:18 +02:00

smallarms

…

spectator

fix spectator view if called instantly

2015-09-25 12:51:13 +02:00

spottingscope

better animation for spotting scope, fix #1638

2015-08-30 13:10:25 +02:00

switchunits

add english translation to switch units module

2015-09-16 23:49:34 +02:00

tacticalladder

Merge remote-tracking branch 'origin/master' into pl-strings

2015-10-04 12:25:55 +02:00

testmissions

README.md files added to all modules

2015-08-19 04:18:33 +02:00

thermals

Fixed Capitalized folders on include paths

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

tripod

rework modifier key, cleanup sandbags, tripod, ladder, fix #2590

2015-09-26 03:16:55 +02:00

ui

Merge branch 'master' into uiSettings

2015-10-08 00:06:41 +02:00

vector

Merge branch 'master' into ace_spectator

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

vehiclelock

"cherrypick" PR #2496 (lockpick)

2015-09-19 10:02:37 -05:00

vehicles

Merge pull request #2387 from acemod/FixHCPPE

2015-09-15 21:04:37 +02:00

viewdistance

Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros

2015-09-15 14:51:23 +02:00

weaponselect

remove obsolete functions

2015-09-27 17:15:59 +02:00

weather

Merge pull request #2007 from jokoho48/codeCleanupWeather

2015-10-04 09:36:32 +02:00

winddeflection

Merge pull request #2387 from acemod/FixHCPPE

2015-09-15 21:04:37 +02:00

yardage450

Russian Translations - Update

2015-09-03 04:54:52 +03:00

zeus

Added Zeus modules for adding Spare Tracks and Wheels

2015-09-27 00:29:19 +02:00