W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-03 20:11:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,659 Commits 20 Branches 18 Tags
3b8bb56ccea2d96b31db2d848eae3c473b3d619c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
[VB]AWOL 3b8bb56cce forgot to escape regex chars 2014-02-11 17:11:38 -06:00
[VB]AWOL 51d2468ac4 Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-11 16:03:58 -06:00
[VB]AWOL 6ad05d71c7 fix Error Undefined variable in expression and trader menu cache 2014-02-11 16:03:55 -06:00
vbawol 4823855295 Update CHANGE LOG 1.0.4.2.txt 2014-02-11 15:36:13 -06:00
[VB]AWOL 403f3ef455 added stairs with railings 2014-02-11 15:21:21 -06:00
[VB]AWOL 78bb0df862 missed this one 2014-02-11 13:55:23 -06:00
vbawol e00bd0c7a4 Update CHANGE LOG 1.0.4.2.txt 2014-02-11 13:31:13 -06:00
[VB]AWOL 94b47f3c3b Updated Axeman's lighting system disabled by default 2014-02-11 13:29:16 -06:00
[VB]AWOL c772e51a55 added Fank to Contributors 2014-02-11 13:28:46 -06:00
[VB]AWOL 15c2f5bbe4 Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-11 13:12:55 -06:00
[VB]AWOL c307a492a7 new bikey for 1.0.4.2 2014-02-11 13:12:51 -06:00
[VB]AWOL 4c0b769a6e version bump on all pbos 2014-02-11 12:28:34 -06:00
[VB]AWOL c8c456309e make silver briefcases brown 2014-02-11 12:25:31 -06:00
vbawol 3678ab6642 Merge pull request #1104 from icomrade/master 
Undefined Variable Cleanup
 2014-02-11 01:51:43 -06:00
[VB]AWOL b8f2796fa3 cleanup 2014-02-10 14:41:47 -06:00
[VB]AWOL 2d9d5feaa8 Not sure why this was removed 
@infiStar any reason this was removed?
 2014-02-10 14:09:27 -06:00
[VB]AWOL 46dae90e9c version bump to 1.0.4.2 2014-02-10 11:16:50 -06:00
[VB]AWOL 126eafb590 change log typo 2014-02-10 11:14:54 -06:00
vbawol c76830da93 Update CHANGE LOG 1.0.4.2.txt 2014-02-10 11:12:16 -06:00
[VB]AWOL 46812d8ded Trade counter was incorrectly returning number of output items 2014-02-10 11:09:51 -06:00
vbawol 8f78dd9ba7 Update CHANGE LOG 1.0.4.2.txt 2014-02-10 10:58:26 -06:00
[VB]AWOL a93286033d fixes #1084 2014-02-10 10:55:43 -06:00
vbawol f06a6fb540 unused 2014-02-10 09:37:18 -06:00
vbawol 67d138161f remove unused code 2014-02-09 20:02:10 -06:00
vbawol 1986231f46 Update CHANGE LOG 1.0.4.2.txt 2014-02-09 18:09:59 -06:00
vbawol 2bbd553dfa Update CHANGE LOG 1.0.4.2.txt 2014-02-09 17:54:15 -06:00
vbawol 154a3f404e Merge pull request #1101 from icomrade/master 
Fix <NULL> kill message fix
 2014-02-09 14:41:14 -06:00
[VB]AWOL 98a08b2c86 1.0.4.2 changelog 2014-02-09 12:27:41 -06:00
vbawol 408879a150 Update CHANGE LOG 1.0.5.txt 2014-02-09 12:18:52 -06:00
vbawol ec3dde0c10 Update CHANGE LOG 1.0.5.txt 2014-02-09 12:18:22 -06:00
vbawol a2a1070b93 Merge pull request #1100 from icomrade/master 
Fix issues with strange A2 install and A2 free
 2014-02-09 12:15:29 -06:00
[VB]AWOL 708787db91 Allow maintain options even on godmodebases 2014-02-09 11:09:04 -06:00
vbawol 30960d1325 Merge pull request #1098 from Fank/patch-6 
Added Config Crafting inputstrict
 2014-02-09 08:38:08 -06: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
[VB]AWOL e6873f96da again... 2014-02-07 22:13:18 -06:00
[VB]AWOL 6cca4f3dde same as last 2014-02-07 21:42:56 -06:00
[VB]AWOL 7dcd5c16c8 fixed typo in Napf Sauerland and panthera server_traders.sqf 2014-02-07 18:18:38 -06:00
[VB]AWOL 11bc959e5f 1.0.4.1 final server pbo 2014-02-07 12:50:24 -06:00
[VB]AWOL b442a899d3 final server pbo 2014-02-07 08:50:37 -06:00
[VB]AWOL 1a0874455f change bikey for 1.0.4.1 2014-02-07 08:50:15 -06:00
[VB]AWOL de6bf86e63 fix sql again? 2014-02-07 08:33:39 -06:00
[VB]AWOL 0d0649b98f release soon 2014-02-07 00:14:22 -06:00
vbawol 168d3156d1 Merge pull request #1088 from icomrade/master 
Fix include error, fix prefix filename
 2014-02-06 20:32:55 -06:00
[VB]AWOL 55c56220d4 sfx version bump 2014-02-06 20:14:59 -06:00
vbawol c92efd892f Merge pull request #1087 from icomrade/patch-1 
Fix config error
 2014-02-06 20:11:06 -06:00
[VB]AWOL 86d0efe77d in testing 2014-02-06 16:28:13 -06: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
[VB]AWOL 3ea0be14d2 remove copper 2014-02-06 14:33:09 -06:00
vbawol ceabbcd04b Update CHANGE LOG 1.0.4.1.txt 2014-02-06 13:54:19 -06:00
vbawol aff5c5945b Merge pull request #1085 from icomrade/master 
Fix init errors, improve antihack
 2014-02-06 13:53:01 -06:00
[VB]AWOL f03a46ea8b Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-06 12:38:00 -06:00
vbawol ef0901a1f9 Update CHANGE LOG 1.0.4.1.txt 2014-02-06 12:29:43 -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
vbawol 57f7431ee0 Update CHANGE LOG 1.0.4.1.txt 2014-02-06 12:27:35 -06:00
vbawol 5170d20ea7 Merge pull request #1082 from Fank/Feature/1072 
Added DZE_StaticConstructionCount
 2014-02-06 12:24:30 -06: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
vbawol 3e72ef5091 Merge pull request #1079 from Fank/patch-2 
Syntax fix
 2014-02-06 08:33:35 -06:00
vbawol a625738ce9 Update 1.0.4.1_Updates.sql 2014-02-06 00:28:45 -06:00
[VB]AWOL e0ad35899e fix readme to show what mods are included with napf 2014-02-06 00:17:32 -06:00
[VB]AWOL 1255ccfe89 added BAF_Merlin_DZE to heli lift 2014-02-06 00:17:02 -06:00
vbawol eca7ed680b Update CHANGE LOG 1.0.4.1.txt 2014-02-05 18:21:52 -06: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
vbawol 789ea9b7ef Merge pull request #1077 from Fank/Feature/1076 
Updated TraderCategory to latest epoch.sql
 2014-02-05 12:18:20 -06: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
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
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
vbawol 24b6b5c3f0 Update 1.0.4.1_Updates.sql 2014-02-04 16:36:25 -06: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
[VB]AWOL 9771ce3f1f Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-04 11:22:16 -06:00