Commit Graph

1523 Commits

Author SHA1 Message Date
icomrade
2546148708 Merge remote-tracking branch 'upstream/master' 2014-02-09 13:07:13 -05:00
icomrade
f7a802a2c1 Fix issues with strange A2 install and A2 free 2014-02-09 13:02:07 -05:00
[VB]AWOL
708787db91 Allow maintain options even on godmodebases 2014-02-09 11:09:04 -06:00
Skaronator
1ad5570552 Cleanup Banned weapon check 2014-02-09 17:23:55 +01:00
vbawol
30960d1325 Merge pull request #1098 from Fank/patch-6
Added Config Crafting inputstrict
2014-02-09 08:38:08 -06: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
[VB]AWOL
caafc7fbcb added init for dayz_myLiftVehicle
dayz_myLiftVehicle removeAction s_player>
Error position: <dayz_myLiftVehicle removeAction s_player>
Error Undefined variable in expression: dayz_myliftvehicle
File z\addons\dayz_code\compile\fn_selfActions.sqf, line 48
2014-02-08 10:49:27 -06: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
Axles
1daa9c72ed Sahrani group removal
I fixeded it!
2014-02-07 10:47:06 -08:00
Skaronator
a814c9b2e9 Not relevant change but its now correctly :P 2014-02-07 17:49:43 +01:00
Skaronator
97c027b558 Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-07 12:46:21 +01:00
Skaronator
7cfbbd2f5f More steps for less obj count 2014-02-07 12:46:17 +01:00
vbawol
168d3156d1 Merge pull request #1088 from icomrade/master
Fix include error, fix prefix filename
2014-02-06 20:32:55 -06:00
icomrade
c796bdbe51 Fix include error, fix prefix filename
Prefixes were not applying when packed with Eliteness, changed name
accordingly.

Also, I just learned that the included init.sqf file must be in a
functions folder (probably due to the scriptName command at the
beginning)
2014-02-06 21:20:46 -05:00
[VB]AWOL
55c56220d4 sfx version bump 2014-02-06 20:14:59 -06:00
icomrade
bdd07e55e7 Fix config error 2014-02-06 19:55:40 -05:00
Skaronator
bce18186d7 Revert "Fix Error if obj hasnt have this variable"
This reverts commit d41611473a.
2014-02-06 23:27:31 +01:00
Skaronator
13ba0d6227 Remove this part 2014-02-06 23:10:18 +01:00
Skaronator
d41611473a Fix Error if obj hasnt have this variable 2014-02-06 23:09:27 +01:00
Skaronator
37a1c86325 Cleanup dayz_server 2014-02-06 23:08:35 +01:00
[VB]AWOL
9d5cdbbd58 private array fixes 2014-02-06 15:05:04 -06:00
[VB]AWOL
f9b2890f3a change over to use static vars add player name to logging 2014-02-06 15:03:35 -06:00
[VB]AWOL
b2108f91d5 Add logging to safe unlock/lock? 2014-02-06 14:37:34 -06:00
Axles
36371ef6af Sahrani updates
Moved wholesaler out of cargo container door, Added black market vendor.
2014-02-06 12:27:17 -08:00
icomrade
38cfc7a715 Fix init errors, improve antihack
Add True value checking, change all true loops to 1 == 1 (1 cannot be
overwritten).

This commit also fixes an error with the latest beta patches.
2014-02-06 14:42:40 -05:00
[VB]AWOL
f03a46ea8b Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-06 12:38:00 -06:00
vbawol
6d7e81eea9 Merge pull request #1083 from Fank/Feature/1078
Feature/1078 will remove key after selling vehicle
2014-02-06 12:27:50 -06:00
Florian Kinder
cc6acb6d8c Feature/1078 will remove key after sell vehicle 2014-02-06 19:19:37 +01:00
Florian Kinder
246d19381d Update 2014-02-06 18:55:57 +01:00
Florian Kinder
f999a0f02b Added DZE_StaticConstructionCount
with DZE_StaticConstructionCount you will force the constructioncount
2014-02-06 18:51:45 +01:00
[VB]AWOL
59d5fcd87f vehicle_handleServerKilled is unused 2014-02-06 09:08:24 -06:00
[VB]AWOL
6b60d77aaf duplicate compile lines code 2014-02-06 09:07:38 -06:00
vbawol
85b1dbcde9 Merge pull request #1081 from Fank/TradeUnlockVehicle
Added trade_any_vehicle_free
2014-02-06 08:35:21 -06:00
vbawol
35c2d6e32e Merge pull request #1080 from Fank/patch-5
Updated Trader Category
2014-02-06 08:34:02 -06:00
Florian Kinder
542be82a58 Added trade_any_vehicle_free
For buy unlocked vehicles (without getting a key)
2014-02-06 12:39:17 +01:00
Skaronator
cdc062a833 Better Movement in Trader Menu, just for config 2014-02-06 11:56:03 +01:00
Skaronator
c3112bc12d Include Base Building Godmode 2014-02-06 11:52:18 +01:00
[VB]AWOL
1255ccfe89 added BAF_Merlin_DZE to heli lift 2014-02-06 00:17:02 -06:00
Skaronator
20379e2912 Add Variable (Just a notice myself) 2014-02-06 00:08:44 +01:00
Florian Kinder
94b6ac805c Updated Trader Category 2014-02-05 22:11:43 +01:00
[VB]AWOL
1a0d2913e8 added MH60S_DZE and BAF_Merlin_DZE to trader configs
type = "trade_any_vehicle";
		buy[] = {2,"ItemBriefcase100oz"};
		sell[] = ;
	};
2014-02-05 14:33:36 -06:00
Skaronator
9e3c82378f Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-05 20:00:15 +01:00
Skaronator
5deef8ba5c Price Review on maintain area? 2014-02-05 20:00:11 +01:00
vbawol
789ea9b7ef Merge pull request #1077 from Fank/Feature/1076
Updated TraderCategory to latest epoch.sql
2014-02-05 12:18:20 -06:00
Florian Kinder
5c25993b67 Updated TraderCategory to latest epoch.sql 2014-02-05 19:11:58 +01:00
[VB]AWOL
55b46b45c8 Re-added old trader code for backwards compatibility 2014-02-05 12:08:49 -06:00