Commit Graph

2644 Commits

Author SHA1 Message Date
vbawol
eca7ed680b Update CHANGE LOG 1.0.4.1.txt 2014-02-05 18:21:52 -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
Florian Kinder
d71e080ce4 Syntax fix
thats the reason why the helis where not added :P
2014-02-05 22:10:16 +01:00
vbawol
13d543007e Update epoch.sql 2014-02-05 14:55:15 -06: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
[VB]AWOL
a84ee657ec 1.0.4.1 testing started 2014-02-05 13:45:33 -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
Axles
acdb7e7c6a NAPF BEIDI 2014-02-05 10:45:26 -08: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
36fa99d5ce current test build 2014-02-05 12:09:39 -06:00
[VB]AWOL
a7407d4a65 Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-05 12:08:52 -06:00
[VB]AWOL
55b46b45c8 Re-added old trader code for backwards compatibility 2014-02-05 12:08:49 -06:00
[VB]AWOL
963b54b024 not needed here 2014-02-05 12:02:58 -06:00
vbawol
7190555d93 Update epoch.sql 2014-02-05 11:55:00 -06:00
[VB]AWOL
27cf548694 Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-05 11:50:25 -06:00
[VB]AWOL
5674415bed latest trader_data for 1.0.4.1 2014-02-05 11:50:21 -06:00
vbawol
5bbf3d00e6 Update CHANGE LOG 1.0.4.1.txt 2014-02-05 11:45:02 -06:00
vbawol
07cefc66f4 Update CHANGE LOG 1.0.4.1.txt 2014-02-05 11:43:40 -06:00
vbawol
181b5965c5 Update CHANGE LOG 1.0.4.1.txt 2014-02-05 11:27:52 -06:00
vbawol
eb401e4a50 Update CHANGE LOG 1.0.4.1.txt 2014-02-05 11:26:35 -06:00
[VB]AWOL
409b1dca9f fixed empty case string 2014-02-05 11:06:44 -06:00
[VB]AWOL
00ee3121c1 Added briefcase storage for 10oz silver
also make trader give over 2 x 10oz silver in briefcases
2014-02-05 10:44:36 -06:00
[VB]AWOL
18f158b559 TrashJackDaniels for ItemTinBar instead 2014-02-05 10:06:30 -06:00
Skaronator
4a9a1e46ec Merge pull request #1075 from Fank/master
Missing External class reference
2014-02-05 16:42:11 +01:00
Florian Kinder
76542e64ab Missing External class reference 2014-02-05 16:36:40 +01:00
vbawol
143f5ef047 Merge pull request #1073 from Fank/Feature/967
Feature/967
2014-02-05 09:24:17 -06:00
[VB]AWOL
60a6aeac10 force trade menu above static trade options 2014-02-05 09:17:24 -06:00
[VB]AWOL
69661a22b4 removed trade metals options fixes #1074 2014-02-05 09:15:09 -06: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
Skaronator
1d98c87535 Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-05 08:50:46 +01:00
Skaronator
0415cbef8f update imgs 2014-02-05 08:50:41 +01:00
vbawol
dfcf699e04 Update CHANGE LOG 1.0.4.1.txt 2014-02-04 18:24:23 -06:00
vbawol
3bef2d526e Update CHANGE LOG 1.0.4.1.txt 2014-02-04 18:23:10 -06:00
Skaronator
294697d7e0 Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-05 00:14:04 +01:00
Skaronator
d8510bc8f0 Move to unbinned pbo 2014-02-05 00:14:00 +01:00
vbawol
24b6b5c3f0 Update 1.0.4.1_Updates.sql 2014-02-04 16:36:25 -06:00
Skaronator
bc49fc5966 Remove Duplicate 2014-02-04 23:31:46 +01:00
Skaronator
8de6243ce5 Revert "Add missing includes"
This reverts commit 4ca2397dbf.
2014-02-04 23:30:06 +01:00
Skaronator
4ca2397dbf Add missing includes 2014-02-04 23:11:04 +01:00
Skaronator
133b6e5b27 Merge pull request #1071 from Fank/Feature/824
Updated Categories
2014-02-04 14:05:38 -08: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