icomrade 5f054393e5 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	SQF/dayz_code/compile/fn_damageActions.sqf
#	SQF/dayz_code/compile/fn_selfActions.sqf

2016-05-02 20:44:50 -04:00

..

achievements

Update private tags

2016-03-30 14:55:45 -04:00

actions

Merge remote-tracking branch 'origin/master'

2016-05-02 20:44:50 -04:00

anim

Revert to old chainsaw RTM files

2016-04-27 14:42:50 -04:00

compile

Merge remote-tracking branch 'origin/master'

2016-05-02 20:44:50 -04:00

Configs

Fix Adv Trade localized string spacing

2016-05-02 19:51:48 -04:00

eventHandlers

Missing Files

2016-02-29 00:55:29 -05:00

external/R3F_Realism

Change R3F overburden to force slow move

2016-04-24 18:19:01 -04:00

gui

Add lower volume / earplugs hotkey and status UI icon

2016-04-30 21:19:24 -04:00

init

Add A Plot For Life modification by RimBlock

2016-05-02 20:42:37 -04:00

loot

Fix wrong bloodbag types spawning

2016-05-01 14:15:01 -04:00

medical

Fix dayz_nutrition RPT error on login

2016-04-26 18:46:36 -04:00

system

Better combat log detection method on server

2016-05-02 15:12:43 -04:00

traps

Finish Medical and Sleep to UiSleep

2016-03-05 22:34:25 -05:00

util

Update some WeaponHolder to WeaponHolderBase

2016-03-31 11:35:33 -04:00

$PBOPREFIX$

Fix include error, fix prefix filename

2014-02-06 21:20:46 -05:00

config.cpp

Added ZSCdefines. Checking plotfriends against dayz_playerUID.

2016-04-30 02:01:27 +02:00

configVariables.sqf

Add A Plot For Life modification by RimBlock

2016-05-02 20:42:37 -04:00

credits.txt

Update some WeaponHolder to WeaponHolderBase

2016-03-31 11:35:33 -04:00

do_not_use_without_permissions.txt

Stringtable - Needs to be merged with DayZ_Epoch

2016-02-21 13:16:17 -05:00

music.fsm

Update some WeaponHolder to WeaponHolderBase

2016-03-31 11:35:33 -04:00

stringtable.xml

Fix Adv Trade localized string spacing

2016-05-02 19:51:48 -04:00