gienkov 212862a401 Merge remote-tracking branch 'origin' into pl-translation-1 ...

Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/frag/stringtable.xml

2015-05-31 22:45:09 +02:00

..

advanced_ballistics

Merge remote-tracking branch 'origin' into pl-translation-1

2015-05-31 22:45:09 +02:00

ai

Fixed Capitalized folders on include paths

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

aircraft

Made better with Pabstology (tm)

2015-05-12 15:53:49 +02:00

apl

Added author

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

atragmx

Updated all airFriction values according to: extras/airFrictionAnalysis.txt

2015-05-31 16:45:59 +02:00

attach

Fixed Capitalized folders on include paths

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

backpacks

Some missing private defines.

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

ballistics

Updated all airFriction values according to: extras/airFrictionAnalysis.txt

2015-05-31 16:45:59 +02:00

captives

added spansih translate

2015-05-27 15:27:04 +02:00

common

Progress bar stops on death - fix for #1449

2015-05-31 09:23:36 +02:00

difficulties

Create README.md

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

disarming

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

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

disposable

Fixed Capitalized folders on include paths

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

dragging

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

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

explosives

Merge pull request #1417 from acemod/localDefuseObjects

2015-05-30 15:46:07 -05:00

fcs

Merge remote-tracking branch 'origin/superTime'

2015-05-22 07:24:55 -07:00

flashsuppressors

Czech translation - Update

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

fonts

Fixed: Font config breaking checkPBO

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

frag

Merge remote-tracking branch 'origin' into pl-translation-1

2015-05-31 22:45:09 +02:00

gforces

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

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

goggles

Goggles - Cache Surface Dust

2015-05-28 00:18:45 -05:00

grenades

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

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

hearing

added spansih translate

2015-05-27 15:27:04 +02:00

hitreactions

prevent ai fro being stuck, #290

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

interact_menu

Added blur background client setting

2015-05-29 21:56:07 +02:00

interaction

added spansih translate

2015-05-27 15:27:04 +02:00

inventory

Fixed Capitalized folders on include paths

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

javelin

Javelin - Only run if weapon and ammo supported

2015-05-25 05:38:45 -05:00

kestrel4500

Merge remote-tracking branch 'origin/superTime'

2015-05-22 07:24:55 -07:00

laser

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

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

laser_selfdesignate

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

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

laserpointer

Added: More italian translations

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

logistics_uavbattery

Fix UAV and Interaction Compile Inheritance

2015-05-17 13:51:59 -05:00

logistics_wirecutter

Cleanup #1095

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

magazinerepack

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

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

main

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

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

map

added spansih translate

2015-05-27 15:27:04 +02:00

maptools

Fixed Capitalized folders on include paths

2015-05-20 23:28:10 +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 pull request #1256 from acemod/medicalExtension

2015-05-29 23:16:00 +02:00

microdagr

added spansih translate

2015-05-27 15:27:04 +02:00

missileguidance

added spansih translate

2015-05-27 15:27:04 +02:00

missionmodules

added spansih translate

2015-05-27 15:27:04 +02:00

mk6mortar

added spansih translate

2015-05-27 15:27:04 +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

Merge pull request #1302 from acemod/nameTagFixes

2015-05-27 12:19:17 -05:00

nightvision

NightVision adjustment - use CSE's gamma

2015-05-29 15:37:53 -05:00

noidle

indentation

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

noradio

…

norearm

hide rearm action for players

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

optics

Patch Merge of PR #1156 - Optics for tripplehead

2015-05-27 11:28:06 -05:00

optionsmenu

Merge pull request #1322 from acemod/SendSettingsDirectlyInsteadOfSplitting

2015-05-28 11:54:11 +02:00

overheating

removed useless entries

2015-05-29 22:08:13 +02:00

overpressure

Fixed Capitalized folders on include paths

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

parachute

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

2015-05-21 09:42:44 -07: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

Further improved error handling when AB is enabled with incomplete configs:

2015-05-30 20:06:55 +02:00

realisticnames

Fixed Capitalized folders on include paths

2015-05-20 23:28:10 +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

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

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

respawn

added spansih translate

2015-05-27 15:27:04 +02:00

safemode

#1364 - Prevent script error if bad muzzle

2015-05-22 23:38:16 -05:00

scopes

Fixes broken scope config (#1312)

2015-05-23 17:06:46 +02:00

smallarms

Cleaning up of all tabs in source code files.

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

switchunits

added spansih translate

2015-05-27 15:27:04 +02: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

vector

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

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

vehiclelock

added spansih translate

2015-05-27 15:27:04 +02:00

vehicles

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

2015-05-21 09:42:44 -07: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

Merge pull request #1457 from acemod/weatherReadme

2015-05-31 17:39:52 +02:00

winddeflection

added spansih translate

2015-05-27 15:27:04 +02:00

zeus

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

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