W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-03 15:51:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,560 Commits 20 Branches 18 Tags
6d7e81eea9ce6e221a2589763e1ca966f69d9bc6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
[VB]AWOL 5ab5a3dc8c proper m107 base class type =1 and canlock 0 2014-02-04 11:22:11 -06: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
vbawol 5d32fa4126 Merge pull request #1068 from VeryBigBro/patch-1 
Kg instead of lb
 2014-02-04 06:50:02 -08:00
vbawol d5253c46f4 Merge pull request #1067 from JoSchaap/patch-2 
Add missing sensor for aircraft dealer
 2014-02-04 06:25:33 -08:00
vbawol 9ff766d48b Update CHANGE LOG 1.0.4.1.txt 2014-02-04 01:08:54 -06:00
vbawol f3b505c771 Update CHANGE LOG 1.0.4.1.txt 2014-02-04 01:08:20 -06:00
[VB]AWOL ddcb4276d6 Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-02-03 09:19:11 -06:00
vbawol 0ebd382e44 Update CHANGE LOG 1.0.4.1.txt 2014-02-03 08:53:40 -06:00
vbawol be2cd0374f Update CHANGE LOG 1.0.4.1.txt 2014-02-03 08:53:19 -06:00
vbawol 8a7a06fea4 Update CHANGE LOG 1.0.4.1.txt 2014-02-03 08:49:26 -06:00
[VB]AWOL 9876b42b0a add DZE_DamageBeforeMaint default now 0.09 instead of 0.1 
Also exit with message if no maintainable objects are found
 2014-02-03 08:38:39 -06:00
[VB]AWOL 9524e3a110 Weight for Dutch in Kg 
http://epochmod.com/forum/index.php?/topic/6510-request-r3f-weight-for-dutch-in-kg/?hl=dutch
 2014-02-03 08:32:13 -06:00
[VB]AWOL 5c38e0b9c2 typo with var name change 2014-02-02 14:44:55 -06:00
vbawol 397ea5a0a1 Merge pull request #1062 from vbawol/PVSLockProcess 
Done is Done, make the rest of it to a localSetVariable
 2014-02-02 12:11:50 -08:00
vbawol 66256e41ab Merge pull request #1061 from Fank/patch-2 
Added MH-60S to Trader & Fixed Quantity
 2014-02-02 11:25:01 -08:00
[VB]AWOL 05a5485c62 moved binaries to root of server files and wrote up basic install upgrade guide 2014-02-02 13:22:33 -06:00
[VB]AWOL da7635b2ee Blackhawk and Seahawk Wrecks by [GLT]Myke 2014-02-02 13:01:53 -06:00
vbawol 48dbdd211a Merge pull request #1060 from Fank/Feature/968 
Feature #968
 2014-02-02 10:56:11 -08:00
vbawol b675bbfeea Update 1.0.4.1_Updates.sql 2014-02-02 12:44:10 -06:00
vbawol 88efa6d065 Update 1.0.4.1_Updates.sql 2014-02-02 12:42:45 -06:00
vbawol c4f83ac7b7 Update 1.0.4.1_Updates.sql 2014-02-02 12:41:19 -06:00
vbawol e7dc2a859c Update 1.0.4.1_Updates.sql 2014-02-02 12:38:01 -06:00
vbawol 4180252af5 Update CHANGE LOG 1.0.4.1.txt 2014-02-02 10:44:08 -06:00
vbawol 7312c91941 Update fnc_plyrHit.sqf 2014-02-02 10:42:39 -06:00
vbawol 6b32700e63 Update CHANGE LOG 1.0.4.1.txt 2014-02-02 10:40:28 -06:00
vbawol 6ec8c18f9c Update CHANGE LOG 1.0.4.1.txt 2014-02-02 10:38:25 -06:00
vbawol 9b0d51bfb8 Update CHANGE LOG 1.0.4.1.txt 2014-02-02 10:36:37 -06:00
vbawol 84c6711368 Merge pull request #1059 from maca134/master 
Keep safe/lockbox vars server side until needed
 2014-02-02 08:21:58 -08:00
vbawol bcc3d315ab Update CHANGE LOG 1.0.4.1.txt 2014-02-01 16:24:04 -06:00
vbawol 57e2ab1e17 Merge pull request #1058 from Fank/patch-1 
Added SQL Function DeleteNonKeyVehicles
 2014-02-01 14:21:01 -08:00
[VB]AWOL e2b66dad28 remove delete vehicle without keys 
remove delete vehicle without keys as this needs to be a function not an
event. The unlock event will work but the delete function needs to be
ran before server startup.
 2014-02-01 13:20:59 -06:00
[VB]AWOL 324caa8196 fixed case 2014-02-01 12:20:03 -06:00
[VB]AWOL d5ce364c71 fixed SQL for strict mode thanks to @Tansien 2014-02-01 11:42:43 -06:00
vbawol 4488675ee5 Merge pull request #1055 from Fank/cleanup-2 
Cleanup 2
 2014-01-31 15:39:20 -08:00
vbawol 690439f840 Merge pull request #1052 from Fank/patch-9 
Added Unlock/Delete vehicle SQL Event
 2014-01-31 15:38:55 -08:00
vbawol c5d10e9fdb Update CHANGE LOG 1.0.4.1.txt 2014-01-31 17:29:07 -06:00
[VB]AWOL c264b9c428 duplicate variable 2014-01-31 17:26:59 -06:00
[VB]AWOL 2e3cd47924 option to disable R3F weight system 2014-01-31 17:26:04 -06:00
vbawol ef20675985 Merge pull request #1045 from icomrade/master 
Remove duplicate code + other fix
 2014-01-31 07:08:53 -08:00
[VB]AWOL 01d709230a not wanted here 2014-01-31 09:05:54 -06:00
[VB]AWOL 3d08db1866 remove old sql files 2014-01-31 09:04:08 -06:00
vbawol e701a54a89 Update CHANGE LOG 1.0.4.1.txt 2014-01-31 09:01:14 -06:00
vbawol 94dcb742b0 Update CHANGE LOG 1.0.4.1.txt 2014-01-31 09:00:53 -06:00
vbawol 0590c000b4 Update CHANGE LOG 1.0.4.1.txt 2014-01-30 11:52:56 -06:00
vbawol 15eb2dc3df Merge pull request #1043 from Fank/patch-7 
fixes #1041
 2014-01-30 09:50:14 -08:00
[VB]AWOL 6111f9f402 fixes #1042 2014-01-30 11:47:44 -06:00
[VB]AWOL 144ea74935 version bump for 1.0.4.1 2014-01-30 11:47:14 -06:00
vbawol d846e8796a Update CHANGE LOG 1.0.4.1.txt 2014-01-29 14:43:26 -06:00
vbawol a63d4266c6 Update CHANGE LOG 1.0.4.1.txt 2014-01-29 14:42:44 -06:00
[VB]AWOL efae1fa383 send roadflare to only other players 2014-01-29 14:36:32 -06:00
[VB]AWOL cbcc5a63f6 fixed #1040 2014-01-29 14:21:40 -06:00
[VB]AWOL 589b366ce3 hide body locally and only send to other players 2014-01-29 14:06:41 -06:00