W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-03 12:01:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,877 Commits 20 Branches 18 Tags
b100ca89e687b193b31ea4c2b759f441d495467f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Kinder b100ca89e6 Merge pull request #1229 from Namindu/patch-10 
Added USEC CH53 to dynamic Vehicle spawn.
 2014-05-01 01:45:11 +02:00
Florian Kinder 188825ebc0 Merge pull request #1228 from Namindu/patch-9 
Added USEC CH53 to dynamic Vehicle spawn.
 2014-05-01 01:45:00 +02:00
Florian Kinder bb87b52340 Merge pull request #1227 from Namindu/patch-8 
Added USEC CH53 to dynamic Vehicle spawn.
 2014-05-01 01:44:50 +02:00
Florian Kinder df0845e702 Merge pull request #1226 from Namindu/patch-7 
Added USEC CH53 to dynamic Vehicle spawn.
 2014-05-01 01:44:41 +02:00
Florian Kinder 5c5a0b2e3a Merge pull request #1225 from Namindu/patch-6 
Added USEC CH53 to dynamic Vehicle spawn.
 2014-05-01 01:44:36 +02:00
Florian Kinder 6d15d3facc Merge pull request #1224 from Namindu/patch-5 
Added USEC CH53 to dynamic Vehicle spawn.
 2014-05-01 01:44:08 +02:00
Florian Kinder cda042a5bc Merge pull request #1223 from Namindu/patch-4 
Added USEC CH53 to dynamic Vehicle spawn.
 2014-05-01 01:44:02 +02:00
Florian Kinder 2101b18b0a Merge pull request #1222 from Namindu/patch-3 
Added USEC CH53 to dynamic Vehicle spawn.
 2014-05-01 01:43:55 +02:00
Florian Kinder 66eb30fd15 Merge pull request #1221 from Namindu/patch-2 
Added USEC CH53 to dynamic Vehicle spawn.
 2014-05-01 01:43:48 +02:00
Florian Kinder f5ad4672b3 Merge pull request #1220 from Namindu/patch-1 
Added USEC CH53 to dynamic Vehicle spawn.
 2014-05-01 01:43:13 +02:00
Florian Kinder 370f0ad5f1 Merge pull request #1217 from Sandbird/patch-1 
Update trade_any_vehicle.sqf
 2014-04-29 19:51:18 +02:00
Florian Kinder 4f82e8e380 Added variable DZE_ForceNameTagsInTrader 2014-02-21 00:53:44 +01:00
Florian Kinder a3885ac187 Added german translation 2014-02-20 21:23:49 +01:00
Florian Kinder 684ef74c8e Fixed Deathscreen 2014-02-19 21:44:06 +01:00
Florian Kinder ad22c7df04 Updated Displays 
Disabled new gear system
 2014-02-18 23:51:38 +01:00
Florian Kinder d74602fb95 Updated Death system 2014-02-18 23:22:38 +01:00
Florian Kinder 4e7b4f7705 Update CHANGE LOG 1.0.5.txt 2014-02-17 14:34:15 +01:00
Florian Kinder 86ce8f6879 Replaced obsolete variable 2014-02-17 01:32:45 +01:00
Florian Kinder fb902eb819 Fixed drink/eat 
refs #1132
 2014-02-17 01:15:13 +01:00
Florian Kinder 72dee3c644 Fixed #1132 mistake 
Thanks Skaronator
 2014-02-17 00:15:14 +01:00
Florian Kinder c3cdd80c4d Updated BE filter 2014-02-16 22:41:35 +01:00
Florian Kinder 0c2aebbff2 Fixed not existing cfgmag 2014-02-16 22:39:44 +01:00
Florian Kinder 2a91d7d5bc Updates refs #1109 2014-02-16 22:38:15 +01:00
Florian Kinder 2ed8ac27fd Updated Changelog 2014-02-16 22:18:36 +01:00
Florian Kinder 50774a6b77 Updated Changelog 2014-02-16 22:09:55 +01:00
Florian Kinder cd7718c426 Updated Changelog 2014-02-16 22:06:38 +01:00
Florian Kinder 1463a67262 Updated Changelog 2014-02-16 21:33:33 +01:00
Florian Kinder d09e0ec7f6 Merge pull request #1132 from SilvDev/master 
Fix + Features
 2014-02-16 21:32:11 +01:00
Florian Kinder d66bf8d909 Updated PROPREFIX 2014-02-16 16:51:49 +01:00
Florian Kinder 1e578fff9b Added C130J_US_EP1_DZ 
fixes  #1131
 2014-02-16 16:46:20 +01:00
Florian Kinder f0886c0175 Changelog Update 2014-02-16 15:32:42 +01:00
Florian Kinder 407741b7dd Last changes new lootsystem 
refs #1109
 2014-02-16 00:58:57 +01:00
Florian Kinder dcfaf2e841 Updated LootPos & moved folder 
refs #1109
 2014-02-15 21:17:43 +01:00
Florian Kinder bab669c74a Fixed hilux upgrade 2014-02-15 16:33:22 +01:00
Florian Kinder 07b41f143f Updated CfgServerTraders 
refs #1129
 2014-02-15 14:58:29 +01:00
Florian Kinder 45834527c4 Added SQL Update 1.0.5 
fixes #1129
 2014-02-15 14:53:57 +01:00
Florian Kinder bbdec2733a updated private variable 
refs #1109
 2014-02-15 14:19:00 +01:00
Florian Kinder 86b03dbb70 Merge branch 'Feature/1109' 
Conflicts:
	SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp
	SQF/dayz_code/Configs/CfgBuildingLoot/CfgLootSmall.hpp
	SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp
 2014-02-15 14:14:50 +01:00
Florian Kinder eb74239f21 Added Upgrade version of Pickup PK 2014-02-15 12:46:19 +01:00
Florian Kinder 970f4854f8 Disabled Debug 2014-02-15 02:38:59 +01:00
Florian Kinder b0888b8a64 Updated Loottables 2014-02-15 02:36:35 +01:00
Florian Kinder 4b839a7a2e Merge branch 'Feature/1102-1' 
Conflicts:
	SQF/dayz_code/Configs/CfgVehicles/LAND/datsun.hpp
 2014-02-15 02:12:05 +01:00
Florian Kinder d48f11bb9f Merge pull request #1125 from vbawol/Feature/0 
Updated Craftitem & split config
 2014-02-15 02:08:39 +01:00
Florian Kinder 29cfe1b618 Update config 2014-02-15 02:08:05 +01:00
Florian Kinder 5b0179b196 Added PK_DZ for upgrade vehicles 2014-02-15 02:06:47 +01:00
Florian Kinder 5f3b5b8801 Updated CfgVehicles 2014-02-15 02:02:50 +01:00
Florian Kinder 4954d41389 update upgradeVehicle 2014-02-15 00:32:36 +01:00
Florian Kinder 34444e3494 Added ItemARM 2014-02-15 00:23:57 +01:00
Florian Kinder f0e7622856 Fixed Error in expression 
Error in expression <_ret = _this select _ret;
};
_ret
>
Error position: <_ret
>
Error Undefined variable in expression: _ret
File z\addons\dayz_code\compile\BIS_fnc\fn_selectRandom.sqf, line 23
Error in expression <BIS_fnc_selectRandom;
_outputWeapons =
[_selectedWeapon];
_selectedMag = _select>
Error position: <_selectedWeapon];
_selectedMag = _select>
Error Undefined variable in expression: _selectedweapon
File z\addons\dayz_code\actions\player_craftItem.sqf, line 193
Error in expression <t_doLoop = false;
};
{
player addWeapon _x;
}
forEach _outputWeapons;
{

_itemOu>
Error position: <_x;
} forEach _outputWeapons;
{

_itemOu>
Error Undefined variable in expression: _x
File z\addons\dayz_code\actions\player_craftItem.sqf, line 200
 2014-02-14 00:31:50 +01:00
Florian Kinder 8e99b7a75b Fixed Error in expression 
"DEBUG WEAPONS: [0,B 1-1-H:1
(Fank),"",["ItemGoldBar","ItemGPS",1,1,"sell","GPS","Gold",6701]]"
Error in expression <(_configName in (weapons player)));

if(_isToolBelt
or _isBinocs) then {
_msg = >
Error position: <_isToolBelt or _isBinocs) then {
_msg = >
Error Undefined variable in expression: _istoolbelt
File z\addons\dayz_code\actions\trade_weapons.sqf, line 32
 2014-02-13 22:58:18 +01:00
Florian Kinder 1c2e81b9dd Fixed typo 
Error in expression < (_classname in DZE_DoorsLocked) then {
_object
setVariable ["CharacterID",dayz_>
Error position: <_object setVariable ["CharacterID",dayz_>
Error Undefined variable in expression: _object
File z\addons\dayz_code\actions\player_buildingDowngrade.sqf, line 126
 2014-02-13 22:30:11 +01:00
Florian Kinder ce6246882d Updated Loottables decresed decimal places to 2 2014-02-12 23:57:58 +01:00
Florian Kinder 99791dec20 Updated Converter 2014-02-12 23:53:21 +01:00
Florian Kinder 0c4323b28d Fixed LootTable 
fixed for commit 37516f2df2
 2014-02-12 22:35:29 +01:00
Florian Kinder cf8dd1180e Updated CraftItem 
Always the first/full waterbottle will be taken by melting ores to bars.
To prevent this the bottle with the lowest waterlevel will be taken
 2014-02-12 22:30:37 +01:00
Florian Kinder ad632c7416 Splitted Ores 2014-02-12 21:24:16 +01:00
Florian Kinder 206d2d7952 Added missing side to BTR90 2014-02-12 17:49:30 +01:00
Florian Kinder b081c840cd Added LAV25 ride in back option & updated BTR90 2014-02-12 15:49:50 +01:00
Florian Kinder 76314d5636 Fixed if _hiveResponse is null 
13:21:08 "HIVE: trying to get objects"
13:21:08 Error in expression <ray = call compile format ["%1",_data];
_resultArray
};

server_hiveReadWriteLar>
13:21:08   Error position: <_resultArray
};

server_hiveReadWriteLar>
13:21:08   Error Undefined variable in expression: _resultarray
13:21:08 File z\addons\dayz_server\init\server_functions.sqf, line 172
13:21:08 Error in expression <ction problem... HiveExt
response:"+str(_hiveResponse));
_hiveResponse = ["",0];>
13:21:08   Error position: <_hiveResponse));
_hiveResponse = ["",0];>
13:21:08   Error Undefined variable in expression: _hiveresponse
13:21:08 File z\addons\dayz_server\system\server_monitor.sqf, line 38
 2014-02-12 15:38:51 +01:00
Florian Kinder 705e6963f3 Update CfgLootSmall 
98e49f7ba2
 2014-02-12 02:43:46 +01:00
Florian Kinder d1983bf109 Fixed Undefined variable 
Error Undefined variable in expression: s_player_lockunlock_crtl
 2014-02-12 00:06:00 +01:00
Florian Kinder 98e49f7ba2 Added missing pistols[] to CfgLootSmall 2014-02-12 00:00:42 +01:00
Florian Kinder a275de6337 Correct Briefcase can be ignored 2014-02-11 23:00:08 +01:00
Florian Kinder 6d89460dcc Wrong here 
Error in expression <LAIN DOWN"];
};

} else {
deleteVehicle
_tmpbuilt;
cutText [format[(localize "st>
Error position: <_tmpbuilt;
cutText [format[(localize "st>
Error Undefined variable in expression: _tmpbuilt
File z\addons\dayz_code\actions\player_build.sqf, line 556
 2014-02-11 22:00:20 +01:00
Florian Kinder 387075f6ae Removed obsolete code 2014-02-11 21:56:25 +01:00
Florian Kinder 36a79609b2 Updated Tools 2014-02-11 19:59:36 +01:00
Florian Kinder 7944113218 Updated CfgBuildingLoot 2014-02-11 19:59:31 +01:00
Florian Kinder a3e5438d56 Updated cfgLootSmall 2014-02-11 19:57:46 +01:00
Florian Kinder fea5041cab Updated cfgLoot 2014-02-11 19:55:44 +01:00
Florian Kinder 78a1da77b8 Added Converter for cfgLoot 2014-02-11 19:55:40 +01:00
Florian Kinder 4e06469036 Revert "Convert CfgBuildingLoot.hpp" 
This reverts commit c3de692246.
 2014-02-11 19:50:44 +01:00
Florian Kinder fc1829800c Fixed typo 2014-02-10 22:45:41 +01:00
Florian Kinder e870ea6ab8 Fixed CraftItem 2014-02-09 15:27:21 +01:00
Florian Kinder d4416e8849 Fixed Error in expression remove buildings 
Error in expression <= getNumber(configFile >> "_objType" >> _classname
>> "constructioncount");
diag>
Error position: <_classname >> "constructioncount");
diag>
Error Undefined variable in expression: _classname
File z\addons\dayz_code\actions\remove.sqf, line 50
 2014-02-09 15:06:38 +01:00
Florian Kinder 9ab91d74bc Fixed Error Undefined variable in expression: s_player_tamedog 
Error in expression <er_studybody = -1;

player removeAction
s_player_tamedog;
s_player_tamedog = -1;>
Error position: <s_player_tamedog;
s_player_tamedog = -1;>
Error Undefined variable in expression: s_player_tamedog
File z\addons\dayz_code\compile\fn_selfActions.sqf, line 886
 2014-02-09 14:58:18 +01:00
Florian Kinder e4c9e90442 Added Config Crafting inputstrict 2014-02-09 03:41:37 +01:00
Florian Kinder 96e7afe3d3 Updated BTR90 2014-02-08 16:50:03 +01:00
Florian Kinder 9e788ec2c2 Added BTR90 HQ ride in back option 2014-02-08 14:49:41 +01:00
Florian Kinder 94b6ac805c Updated Trader Category 2014-02-05 22:11:43 +01:00
Florian Kinder 5c25993b67 Updated TraderCategory to latest epoch.sql 2014-02-05 19:11:58 +01:00
Florian Kinder 76542e64ab Missing External class reference 2014-02-05 16:36:40 +01:00
Florian Kinder 279054d2df Unique Prefix 2014-02-05 15:47:28 +01:00
Florian Kinder c8d3668218 Final Fixed version 2014-02-05 15:47:27 +01:00
Florian Kinder bf7110448b Added M113 DZ and AL & fixed compile problem 2014-02-05 15:47:27 +01:00
Florian Kinder da2c954e23 Fixed missing external class reference 2014-02-05 15:47:26 +01:00
Florian Kinder f843454db3 Added LAV25 DZ and AL 2014-02-05 15:47:26 +01:00
Florian Kinder a6a36af074 Added BTR90 DZ and AL 2014-02-05 15:47:25 +01:00
Florian Kinder 69e246d31f Added Neutral Aicraft category 2014-02-04 23:05:11 +01:00
Florian Kinder a7c5ffce40 Added Missing Categories 2014-02-04 23:03:58 +01:00
Florian Kinder cbc99945b6 Updated Categories 2014-02-04 23:03:57 +01:00
Florian Kinder 563a67550c Added missing scope & rebuild MH60S DZE 2014-02-03 20:46:35 +01:00
Florian Kinder bdf398afaa Updated Quantity & fixed TraderId 2014-02-02 20:04:05 +01:00
Florian Kinder 9b7d8a62b9 Added Seahawk (MH-60S) 2014-02-02 20:02:42 +01:00
Florian Kinder 78bfdde630 fixed misstake 2014-02-02 19:26:12 +01:00
Florian Kinder d4e36eaddd Updated Loottables 2014-02-02 19:24:20 +01:00
Florian Kinder bae9f43201 Updated Crashmodels 2014-02-02 19:13:37 +01:00
Florian Kinder 9ca13ccc71 Updated cfgVehicles 2014-02-02 19:10:04 +01:00
Florian Kinder d724965324 Fixed names 2014-02-02 16:11:32 +01:00
Florian Kinder ecbafbf5dc Added new Wrecks 2014-02-02 16:10:12 +01:00
Florian Kinder 1ca0ded660 Fixed UnlockNonKeyVehicles Event 2014-02-01 23:20:27 +01:00