W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,516 Commits 20 Branches 18 Tags
143f5ef047d9e84b9eedf5cd57a7a9560a0b482f
Commit Graph

2516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Kinder
cbc99945b6 Updated Categories 2014-02-04 23:03:57 +01:00
[VB]AWOL
d5ae1920b3 neutral for menu_Soldier_Sniper_PMC 2014-02-04 15:59:16 -06:00
[VB]AWOL
8fa82911ef changed to missionConfigFile and commented out include 
an
 2014-02-04 14:33:41 -06:00
[VB]AWOL
5308ddcf1a faster no need for loading... 2014-02-04 14:13:41 -06:00
[VB]AWOL
731bc92be2 working 2014-02-04 14:11:49 -06:00
[VB]AWOL
37b75bea61 missed bracket 2014-02-04 13:23:20 -06:00
[VB]AWOL
746755f42f testing config traders 2014-02-04 13:12:26 -06:00
[VB]AWOL
a77a43d88f get trader items from config 2014-02-04 12:50:58 -06:00
[VB]AWOL
64657c025f Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-04 12:49:15 -06:00
[VB]AWOL
5db68b7d13 fake trade just for logging when DZE_ConfigTrader = true 
_key = format["CHILD:398:%1:%2:",_traderID,_buyorsell];

_data = "HiveEXT"
_result =
// diag_log ("TRADE: RES: "+ str(_result));
_outcome = _result select 0;
 2014-02-04 12:48:57 -06:00
Skaronator
df13802e19 Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-04 19:02:33 +01:00
Skaronator
d71bb45de3 Something like this to get CfgVehicle/Weapon/Magazine 2014-02-04 19:02:29 +01:00
[VB]AWOL
9771ce3f1f Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-04 11:22:16 -06:00
[VB]AWOL
5ab5a3dc8c proper m107 base class type =1 and canlock 0 2014-02-04 11:22:11 -06:00
Skaronator
4b448c8609 Fix Trader Classesssss 2014-02-04 18:21:50 +01:00
Skaronator
171952e922 Start with ConfigTrader 2014-02-04 17:16:32 +01:00
Skaronator
b6c1bd61a6 Revert "not sure why this is here" 
This reverts commit e954f0ce56.
 2014-02-04 17:11:22 +01:00
[VB]AWOL
e954f0ce56 not sure why this is here 2014-02-04 09:58:03 -06:00
[VB]AWOL
7e0f9cd758 take two 2014-02-04 09:57:42 -06:00
[VB]AWOL
3250c87107 Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-04 09:54:05 -06:00
[VB]AWOL
25d668ee82 fixes #1065 2014-02-04 09:54:02 -06:00
Skaronator
5631145025 Fix #1064 2014-02-04 16:47:15 +01:00
Skaronator
5a82128500 Sort Config 2014-02-04 16:46:11 +01:00
Skaronator
2ecdd4ab3d Cleanup Array 2014-02-04 16:44:20 +01:00
Skaronator
8c8cf0ff22 Sort it a bit and include it 2014-02-04 16:43:23 +01:00
Skaronator
2fdc038632 Merge pull request #1069 from Fank/Feature/824 
SQF & mysql trader To cfg convert refs #824
 2014-02-04 07:25:32 -08:00
Florian Kinder
0f5667eb88 removed tid 2014-02-04 16:19:28 +01:00
vbawol
5d32fa4126 Merge pull request #1068 from VeryBigBro/patch-1 
Kg instead of lb
 2014-02-04 06:50:02 -08:00