icomrade 61c64cb14a Fix Merge Conflict 1

2016-03-03 22:09:38 -05:00

..

achievements

Missing Files

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

actions

Fix Merge Conflict 1

2016-03-03 22:09:38 -05:00

anim

Fixed client crash when player has chainsaw due to corrupt RTM file.

2014-06-25 01:55:52 -05:00

compile

Fix Merge Conflict 1

2016-03-03 22:09:38 -05:00

Configs

Fix Merge Conflict 1

2016-03-03 22:09:38 -05:00

eventHandlers

Missing Files

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

external

Replace sleep with uiSleep

2016-02-17 13:03:17 -05:00

gui

Add journal and preliminary strings for crafting

2016-03-03 20:11:11 -05:00

init

Fix Merge Conflict 1

2016-03-03 22:09:38 -05:00

loot

Missing Files

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

medical

add 2 new vars and fix up variable names

2016-03-01 00:23:14 -05:00

system

Fix Merge Conflict 1

2016-03-03 22:09:38 -05:00

traps

Traps and Utill Folders/Files

2016-02-27 22:31:43 -05:00

util

1.8.7 player_switchWeapon updates

2016-03-03 21:31:32 -05:00

$PBOPREFIX$

Fix include error, fix prefix filename

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

config.cpp

Fix Merge Conflict 1

2016-03-03 22:09:38 -05:00

credits.txt

Stringtable - Needs to be merged with DayZ_Epoch

2016-02-21 13:16:17 -05: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

Replace forEach with Count

2014-05-27 15:37:57 -04:00

NOTE.txt

add 2 new vars and fix up variable names

2016-03-01 00:23:14 -05:00

stringtable.xml

Update Stringtable to 1.8.7

2016-02-22 10:41:09 -05:00