Michael Braun a5fb09a7e1 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ...

Conflicts:
	addons/repair/functions/fnc_moduleRepairSettings.sqf

2015-09-09 02:55:12 +02:00

..

advanced_ballistics

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

2015-08-30 00:35:11 +02:00

ai

Fixed Capitalized folders on include paths

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

aircraft

README.md files added to all modules

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

apl

README.md files added to all modules

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

atragmx

README.md files added to all modules

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

attach

#1571 - Handle Null Attached Objects

2015-08-29 11:47:56 -05:00

backpacks

objectParent command replacing fnc_getBackpackAssignedUnit

2015-08-30 10:45:14 +02:00

ballistics

better saling for tracer sizes, fix #1008

2015-09-01 21:48:40 +02:00

captives

animate head when surrendered and handcuffed

2015-09-01 20:00:28 +02:00

cargo

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

2015-09-09 02:55:12 +02:00

common

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

2015-09-09 02:55:12 +02:00

concertina_wire

#2238 - use config for fences + cleanup

2015-08-23 18:39:08 -05:00

dagr

README.md files added to all modules

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

difficulties

…

disarming

Switched to ACE_LOG<LEVEL>_# variation

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

disposable

README.md files added to all modules

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

dragging

Revert use of param in action string

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

explosives

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

2015-09-09 02:55:12 +02:00

fcs

README.md files added to all modules

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

finger

#1917 - Pointing Update Circle Icon

2015-09-01 10:09:14 -05:00

flashlights

Git fix #3.

2015-08-11 10:59:50 -07: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 branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros

2015-09-01 08:45:59 +02:00

gforces

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

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

goggles

Remove special goggles treatment of vehicle units

2015-08-31 15:25:40 +01:00

grenades

Merge pull request #2358 from acemod/322flashbangexplosive

2015-09-05 13:40:24 +02:00

hearing

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

2015-09-09 02:55:12 +02:00

hitreactions

README.md files added to all modules

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

huntir

Merge pull request #2149 from jokoho48/codeCleanupHuntIR

2015-08-26 15:48:29 +02:00

interact_menu

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

2015-09-01 08:45:59 +02:00

interaction

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

2015-09-01 08:45:59 +02:00

inventory

README.md files added to all modules

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

javelin

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01: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 branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros

2015-09-01 08:45:59 +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

Build number for Release Candidate

2015-09-06 21:37:20 -07:00

map

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

2015-09-09 02:55:12 +02:00

maptools

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

2015-09-09 02:55:12 +02:00

markers

Fix Colors + Debug Trace

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

medical

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

2015-09-09 02:55:12 +02:00

medical_menu

Add Screen Blur and Blackout for Medical Menu by Interact_menu setting

2015-09-05 12:49:23 +02:00

microdagr

Add LoD

2015-09-07 16:10:55 +02:00

missileguidance

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

2015-08-30 00:35:11 +02:00

missionmodules

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

2015-08-30 00:35:11 +02:00

mk6mortar

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

2015-08-30 00:35:11 +02: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 'translate-hu' of https://github.com/Harakhti/ACE3

2015-08-30 00:35:11 +02:00

nametags

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

2015-09-01 08:45:59 +02: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

README.md files added to all modules

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

noradio

Correcting some spacing

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

norearm

README.md files added to all modules

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

optics

completely prevent ace_optics from interfering with any mission camera scripts

2015-08-30 19:30:44 +02:00

optionsmenu

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

2015-08-30 00:35:11 +02:00

overheating

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

2015-09-01 08:45:59 +02:00

overpressure

README.md files added to all modules

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

parachute

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

2015-08-30 00:35:11 +02:00

ragdolls

README.md files added to all modules

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

rangecard

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

2015-08-30 00:35:11 +02:00

realisticnames

Merge pull request #2160 from acemod/updatingBaseClass150

2015-08-29 09:55:25 -05:00

recoil

README.md files added to all modules

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

reload

Standardize logging format through ACE_LOG macros

2015-08-26 15:32:54 +02:00

reloadlaunchers

README.md files added to all modules

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

repair

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

2015-09-09 02:55:12 +02:00

respawn

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

2015-09-09 02:55:12 +02:00

safemode

Replaced padding chain with params defaults

2015-08-14 11:43:36 +02:00

sandbag

README.md files added to all modules

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

scopes

Hotfix for missreplaced variable in projectile direction adjustment

2015-08-23 18:38:19 +02:00

sitting

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

2015-09-09 02:55:12 +02:00

slideshow

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

2015-09-09 02:55:12 +02:00

smallarms

Cleaning up of all tabs in source code files.

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

spectator

Adjust spectator camera speed based on height

2015-08-29 16:05:04 +01:00

spottingscope

better animation for spotting scope, fix #1638

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

switchunits

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

2015-09-01 08:45:59 +02:00

tacticalladder

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

2015-08-30 00:35:11 +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

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

2015-08-30 00:35:11 +02:00

ui

README.md files added to all modules

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

vector

Merge branch 'master' into ace_spectator

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

vehiclelock

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

2015-08-30 00:35:11 +02:00

vehicles

tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190

2015-08-30 20:20:00 +02:00

viewdistance

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

2015-09-01 08:45:59 +02:00

weaponselect

fix weapon select in ffv slots not working

2015-08-30 12:01:13 +02:00

weather

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

2015-08-30 00:35:11 +02:00

winddeflection

high command module breaks ace, fix #2134

2015-09-01 10:06:01 +02:00

yardage450

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

2015-08-30 00:35:11 +02:00

zeus

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

2015-08-30 00:35:11 +02:00