KoffeinFlummi f16f282abd Merge remote-tracking branch 'origin/release' into master-fix ...

Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
	extensions/common/p3d/animation.cpp
	extensions/common/p3d/compressed.cpp
	extensions/common/p3d/compressed.hpp
	extensions/common/pbo/archive.cpp
	extensions/common/pbo/search.cpp
	extensions/common/pbo/search.hpp
	extensions/common/shared.hpp
	extensions/common/simplepipe_win32.cpp
	extensions/common/simplepipe_win32.hpp
	extensions/common/simulation/object.cpp
	extensions/common/simulation/object.hpp
	extensions/common/targetver.h
	extensions/common/vector.hpp

2015-05-20 19:31:55 +02:00

..

advanced_ballistics

PL translation for new advanced ballistics option

2015-05-20 17:17:08 +02:00

ai

keep ai tweaks except of relaod

2015-05-08 20:13:20 +02:00

aircraft

Made better with Pabstology (tm)

2015-05-18 20:58:16 +02:00

apl

Added author

2015-05-01 20:16:34 +02:00

atragmx

ATragMX/Kestrel 4500 dialogs can be toggled on/off with keybinds.

2015-05-17 11:23:31 +02:00

attach

Added: Italian translation from Blackedsoul p#20

2015-05-10 11:05:16 +02:00

backpacks

Some missing private defines.

2015-04-16 12:36:16 -05:00

ballistics

Merge remote-tracking branch 'gienkov/module-translations'

2015-05-14 16:01:41 +02:00

captives

#1298 - Reset handcuffs on respawn

2015-05-18 22:02:50 -05:00

common

Changed: checkFiles extension check prints version returned by extension

2015-05-18 20:59:00 +02:00

difficulties

Create README.md

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

disarming

ACE_isUnique config for mags instead of static list

2015-05-09 17:08:47 -05:00

disposable

Cleanup #1095

2015-05-10 16:19:46 +02:00

dragging

Draggin Privates

2015-05-12 23:01:59 -05:00

explosives

Changed the animation from medic to put when placing an explosive. Added a put animation when setting the trigger for an explosive.

2015-05-20 17:17:09 +02:00

fcs

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

2015-05-01 19:00:27 +02:00

flashsuppressors

Czech translation - Update

2015-05-03 11:48:56 +02:00

fonts

woops. tabs. path.

2015-05-20 17:15:19 +02:00

frag

Frag Privates

2015-05-12 23:19:31 -05:00

gforces

More Privates

2015-04-17 15:45:00 -05:00

goggles

Second batch of settings files

2015-05-14 20:59:25 +02:00

grenades

Merge https://github.com/Dimaslg/ACE3 into spanish-merge

2015-05-01 16:51:20 +02:00

hearing

Second batch of settings files

2015-05-14 20:59:25 +02:00

hitreactions

prevent ai fro being stuck, #290

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

interact_menu

Bandaid for #1281, until we properly solve unreliable init handlers. 1- Menus for CAManBase are precomputed on preInit 2- Class action menus for all men are supposed to be equal to those of CAManBase Note: we loose the capability of defining actions for specific classes from config (which we don't do on ACE annyway)

2015-05-20 17:15:25 +02:00

interaction

Don't show passenger actions for UAV crew

2015-05-17 17:52:56 -05:00

inventory

First batch of settings files

2015-05-14 20:46:35 +02:00

javelin

Remove tabs and repair errors @Glowbal found

2015-05-12 18:27:27 +02:00

kestrel4500

ATragMX/Kestrel 4500 dialogs can be toggled on/off with keybinds.

2015-05-17 11:23:31 +02:00

laser

Documentation pass 3

2015-05-17 21:01:17 +02:00

laser_selfdesignate

Added: More italian translations

2015-05-09 23:52:01 +02:00

laserpointer

Added: More italian translations

2015-05-09 23:52:01 +02:00

logistics_uavbattery

Translation to Portuguese

2015-05-02 03:38:53 -03:00

logistics_wirecutter

Cleanup #1095

2015-05-10 16:19:46 +02:00

magazinerepack

Second batch of settings files

2015-05-14 20:59:25 +02:00

main

Merge remote-tracking branch 'origin/release' into master-fix

2015-05-20 19:31:55 +02:00

map

#1181 - Reset BFT_markers array each time

2015-05-18 21:34:17 +02:00

maptools

Second batch of settings files

2015-05-14 20:59:25 +02:00

markers

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

medical

Merge remote-tracking branch 'origin/release' into master-fix

2015-05-20 19:31:55 +02:00

microdagr

#1241 closed - Add Editor placeable item

2015-05-20 17:17:10 +02:00

missileguidance

Merge remote-tracking branch 'gienkov/module-translations'

2015-05-14 16:01:41 +02:00

missionmodules

Remove tabs and repair errors @Glowbal found

2015-05-12 18:27:27 +02:00

mk6mortar

Second batch of settings files

2015-05-14 20:59:25 +02:00

modules

Transfered ballistics support (as discussed with glowbal)

2015-05-11 14:45:37 +01:00

movement

First batch of settings files

2015-05-14 20:46:35 +02:00

nametags

Added isNull check wrapper to nametag color propagation.

2015-05-19 09:19:03 -07:00

nightvision

Added missing PBOPREFIX files

2015-05-11 17:37:08 +02:00

noidle

indentation

2015-03-26 18:03:13 +01:00

noradio

More Privates

2015-04-17 15:45:00 -05:00

norearm

hide rearm action for players

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

optics

Localization update

2015-04-29 11:20:21 +03:00

optionsmenu

Second batch of settings files

2015-05-14 20:59:25 +02:00

overheating

Second batch of settings files

2015-05-14 20:59:25 +02:00

overpressure

Cleaning up of all tabs in source code files.

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

parachute

Initial categories

2015-04-30 22:02:20 +02:00

protection

Fix 1.44 Updating Base Class

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

ragdolls

Add remaining READMEs, add helper script

2015-01-26 14:34:48 +01:00

realisticnames

Removed Titan realistic name as it's not implemented yet as a Spike

2015-05-12 21:32:30 +02:00

recoil

Removed debug output

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

reload

Second batch of settings files

2015-05-14 20:59:25 +02:00

reloadlaunchers

Added: Italian translations completed.

2015-05-10 11:44:46 +02:00

respawn

Second batch of settings files

2015-05-14 20:59:25 +02:00

safemode

Fixed safemode module indentation

2015-05-15 15:41:41 +02:00

scopes

Elevation and windage can now have different adjustment increments:

2015-05-19 20:13:31 +02:00

smallarms

Cleaning up of all tabs in source code files.

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

switchunits

Second batch of settings files

2015-05-14 20:59:25 +02:00

testmissions

Cleaning up of all tabs in source code files.

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

thermals

quotes in config arrays

2015-05-11 18:50:04 +02:00

vector

Added: More italian translations

2015-05-10 00:04:42 +02:00

vehiclelock

Documentation: Vehiclelock - 1st iteration

2015-05-16 23:42:54 +03:00

vehicles

plurals

2015-04-30 22:39:33 +02:00

viewdistance

- Default viewDistance to video settings - Add 500m and 100m as optional view distances

2015-05-20 17:17:08 +02:00

weaponselect

Revered macro on fnc_throwGrenade

2015-05-15 14:47:37 +02:00

weather

Fixed clashing MACRO names

2015-05-16 21:10:34 +02:00

winddeflection

Remove tabs and repair errors @Glowbal found

2015-05-12 18:27:27 +02:00

zeus

Using inline code instead of holdover function

2015-05-15 21:09:55 +01:00