merged in Axemans pull

This commit is contained in:
[VB]AWOL
2013-09-26 20:42:57 -05:00
parent c1339e4a6e
commit ccd685ab76
29 changed files with 2855 additions and 2647 deletions

View File

@@ -100,6 +100,7 @@ if (!isDedicated) then {
object_pickup = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_pickup.sqf";
player_flipvehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_flipvehicle.sqf";
player_sleep = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_sleep.sqf";
player_mineOre = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_mineOre.sqf";
//ui
player_selectSlot = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\ui_selectSlot.sqf";
@@ -810,4 +811,4 @@ if (!isDedicated) then {
//Start Dynamic Weather
execVM "\z\addons\dayz_code\external\DynamicWeatherEffects.sqf";
initialized = true;
initialized = true;