W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-03 19:41:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,463 Commits 20 Branches 18 Tags
70f232e0ffe942a3d479c863c32eafda99cee9f4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
vbawol 86551302de Merge pull request #1626 from Mikeeeyy/patch-12 
Fix rare occasion of gear not updating
 2015-02-08 08:26:13 -06:00
vbawol 7fcb7ff657 Merge pull request #1610 from deannreid/patch-1 
Fixed Black Screen on Loading
 2015-02-06 09:31:05 -06:00
vbawol d472450062 Merge pull request #1621 from ebaydayz/patch-7 
[FIXED] Trader menu expected array error
 2015-02-05 10:15:03 -06:00
vbawol 1c87cac11a Merge pull request #1620 from ebaydayz/patch-6 
Fix trader menu expected array error
 2015-02-05 10:14:55 -06:00
vbawol 0efa8ea37b Merge pull request #1619 from ebaydayz/patch-5 
Fix trader menu expected array error
 2015-02-05 10:14:48 -06:00
vbawol cdb0399f19 Merge pull request #1618 from ebaydayz/patch-4 
Fix trader menu expected array error
 2015-02-05 10:14:37 -06:00
vbawol a664da7b3e Merge pull request #1611 from Mikeeeyy/patch-9 
Update server_updateObject.sqf
 2015-02-05 10:12:02 -06:00
vbawol 172b9e21c7 Merge pull request #1615 from ebaydayz/patch-2 
Update CHANGE LOG 1.0.5.2.txt
 2015-02-05 10:10:27 -06:00
vbawol 23791fc1d8 Merge pull request #1614 from ebaydayz/patch-1 
Compact mission.sqm port from DayZ Mod 1.8.3
 2015-02-05 10:09:59 -06:00
vbawol 26f51ad9f9 Merge pull request #1609 from Namindu/patch-32 
Update CHANGE LOG 1.0.5.2.txt
 2015-01-18 16:26:04 -06:00
vbawol 9f17fe3f18 Merge pull request #1608 from deadeye2/patch-4 
Update CHANGE LOG 1.0.5.2.txt
 2015-01-18 12:56:40 -06:00
vbawol ed0234139e Merge pull request #1457 from Namindu/patch-8 
Added RedRyder BB Gun Ammo to Loot Table
 2015-01-18 00:44:18 -06:00
vbawol 9c70f0f2d4 Merge pull request #1456 from Namindu/patch-7 
Added RedRyder BB Gun to Loot Table
 2015-01-18 00:44:11 -06:00
vbawol dc772e7384 Merge pull request #1581 from Jamie-Booth/master 
Add the _ to the Land and escape the character
 2015-01-18 00:42:16 -06:00
[VB]AWOL b21afc8d0a red ryder model path changes 2015-01-18 00:45:00 -06:00
vbawol 196a8b2e94 Merge pull request #1600 from BangL/master 
custom CfgVehicles? i dont think so
 2015-01-18 00:37:17 -06:00
vbawol 32bcb8515b Merge pull request #1592 from raginruffalo/patch-1 
Fixed a sound error and organized file more
 2015-01-18 00:36:31 -06:00
vbawol 010c164d22 Merge pull request #1589 from Markokil321/patch-5 
Update HiveExt.ini
 2015-01-18 00:36:17 -06:00
vbawol 665de9d917 Merge pull request #1580 from deadeye2/patch-3 
DZE_MissionLootTable fix
 2015-01-18 00:35:02 -06:00
vbawol 4c62c1a55e Merge pull request #1582 from Geodar/master 
Another batch of czech
 2015-01-18 00:34:38 -06:00
vbawol 54f4cc5024 Merge pull request #1561 from ebaydayz/patch-1 
Delete old group after changing clothes
 2015-01-18 00:33:57 -06:00
vbawol 21098f9b73 Merge pull request #1556 from raginruffalo/patch-3 
Should fix #1555
 2015-01-18 00:33:10 -06:00
vbawol 211a74a645 Merge pull request #1540 from deadeye2/patch-2 
Update player_drink.sqf
 2015-01-18 00:32:38 -06:00
vbawol a5e8aae13b Merge pull request #1539 from deadeye2/patch-1 
undefined variable _itemtodrop     fixes #1535
 2015-01-18 00:31:54 -06:00
vbawol 1187207dcf Merge pull request #1606 from Mikeeeyy/patch-8 
Update server_updateObject.sqf
 2015-01-18 00:26:58 -06:00
vbawol e8c0f6da6a Merge pull request #1574 from RimBlock/master 
Minor DB dump batch file change.
 2014-10-12 18:31:01 -05:00
vbawol 4bac499c74 Merge pull request #1578 from Markokil321/patch-5 
Update add_recommended_mysql_events.sql
 2014-10-12 18:30:42 -05:00
vbawol d8dd028c5f Merge pull request #1572 from MadHatter05/patch-1 
OCD update to init.sqf - 11.chernarus
 2014-10-01 16:43:24 -05:00
vbawol 76000d59f9 Merge pull request #1573 from MadHatter05/patch-2 
OCD update to description.ext - 11.chernarus
 2014-10-01 16:43:14 -05:00
vbawol b0ae579875 Update spawn_loot_small.sqf 2014-09-22 13:23:56 -05:00
vbawol b7e2462188 Merge pull request #1552 from raginruffalo/patch-3 
Fixed a ton of errors
 2014-08-28 11:03:10 -05:00
vbawol 1e8f146860 Merge pull request #1553 from ADK-DAYZMOD-EPOCH/master 
UPDATED rotate_logs.bat
 2014-08-28 11:02:50 -05:00
vbawol d52eb620e6 Merge pull request #1541 from raymix/master 
code optimization, bugs, improvements
 2014-08-28 00:28:20 -05:00
vbawol 9762dad8ee Merge pull request #1543 from Beefheart/master 
Update player_onPause.sqf
 2014-08-28 00:28:09 -05:00
vbawol 6f58a882aa Merge pull request #1544 from arma2WillRobinson/master 
Corrected all Red Ryder paths
 2014-08-27 11:04:58 -05:00
vbawol 727a2d211a Merge pull request #1551 from Uro1/master 
Update CfgServerTrader to match #1508
 2014-08-27 11:01:36 -05:00
vbawol 740f4144f1 Merge pull request #1534 from raymix/master 
updated stringtable compatibility with modular build
 2014-08-18 00:59:52 -05:00
vbawol 2542d94c21 Merge pull request #1531 from McKeighan/patch-10 
Update UAZ.hpp
 2014-08-17 14:04:00 -05:00
vbawol a8a0e0ca5c Merge pull request #1532 from McKeighan/patch-11 
Update Volha.hpp
 2014-08-17 14:03:31 -05:00
vbawol fe5af9425a Merge pull request #1526 from Mikeeeyy/patch-4 
Update cannot build plot pole within 45m.
 2014-08-17 14:02:09 -05:00
vbawol ac07359c80 Merge pull request #1525 from Mikeeeyy/patch-3 
Update cannot build plot pole within 45m.
 2014-08-17 14:02:03 -05:00
vbawol a6f55498b7 Merge pull request #1528 from raymix/master 
modular build code optimization + some extras
 2014-08-15 01:52:04 -05:00
vbawol 59124e6eef Merge pull request #1523 from Legodev/master 
added Items for a simple Plantingsystem
 2014-08-14 12:20:58 -05:00
vbawol 8192dd7b50 Merge pull request #1519 from McKeighan/patch-7 
Update Offroad_DSHKM.hpp
 2014-08-14 12:09:57 -05:00
vbawol 8bd438f4c6 Merge pull request #1515 from McKeighan/patch-3 
Update AH6.hpp
 2014-08-14 12:08:06 -05:00
vbawol ba6a5c7dc1 Merge pull request #1513 from McKeighan/patch-1 
Update cfgVehicles.hpp
 2014-08-14 12:06:59 -05:00
vbawol c7b400f36a Merge pull request #1524 from Mikeeeyy/patch-2 
Fix Maintain Area/Preview not disappearing
 2014-08-14 12:06:31 -05:00
vbawol d8841474c6 Merge pull request #1521 from SJossy/patch-3 
Update fn_damageActions.sqf
 2014-08-14 12:05:27 -05:00
vbawol ef0a157eb2 Merge pull request #1512 from raymix/master 
minor range adjustments
 2014-08-14 12:01:52 -05:00
vbawol a0372bc88d Merge pull request #1509 from SJossy/patch-2 
Update server_functions.sqf
 2014-08-14 12:01:34 -05:00
vbawol ca37210345 Merge pull request #1511 from Markokil321/patch-5 
Update player_goFishing.sqf
 2014-08-10 23:47:49 -05:00
vbawol 29adecc2e9 Merge pull request #1510 from Markokil321/patch-4 
Add "Cannot fish while in combat"  text
 2014-08-10 23:47:36 -05:00
vbawol db15170622 Merge pull request #1508 from Uro1/master 
Dynamic_vehicle & Traders spawning non-upgradable classes of hilux1 & datsun1 vehicles
 2014-08-10 23:47:13 -05:00
vbawol 95676f0db7 Merge pull request #1507 from Beefheart/patch-1 
Update Lada.hpp
 2014-08-10 23:41:41 -05:00
vbawol 2bd68a04f6 Merge pull request #1506 from raymix/master 
bug fix & adjustable snap range
 2014-08-08 12:19:48 -05:00
vbawol ff706fde43 Merge pull request #1505 from raymix/master 
function based player_build
 2014-08-07 11:19:18 -05:00
vbawol 676bb91122 Merge pull request #1501 from infiSTAR/patch-1 
delete promptRName.sqf
 2014-08-05 17:56:13 -05:00
vbawol 573bacdfc3 Merge pull request #1491 from ebaydayz/patch-1 
Change count back to forEach
 2014-07-31 12:23:20 -05:00
vbawol 3bc4909c6f Merge pull request #1468 from ebaydayz/patch-1 
Update CHANGE LOG 1.0.5.2.txt
 2014-07-29 15:00:07 -05:00
vbawol f63ad88dbd Merge pull request #1467 from ebaydayz/patch-2 
Change count back to forEach - fix empty safes
 2014-07-29 14:57:54 -05:00
vbawol ec1308afd6 Merge pull request #1466 from ebaydayz/patch-1 
Fix typo _intentory > _inventory
 2014-07-29 13:33:10 -05:00
vbawol 3ec0b2be60 Merge pull request #1465 from Mikeeeyy/patch-1 
Fix for glitching through doors (dayz_spaceInterrupt.sqf)
 2014-07-29 13:33:03 -05:00
[VB]AWOL cb633715fa typo 2014-07-27 23:17:00 -05:00
[VB]AWOL abc4c2f6ce push PHP steam server list query code 
Example of how to get from server list from steam works for both Arma 2
and 3 servers
Original Source:
https://developer.valvesoftware.com/wiki/User:Pizzahut/test.php
 2014-07-27 23:11:49 -05:00
vbawol fc1ce8421e Merge pull request #1459 from raymix/master 
some missing defines
 2014-07-26 15:29:25 -05:00
vbawol 29fe8ced1a Update CHANGE LOG 1.0.5.2.txt 2014-07-26 15:28:02 -05:00
vbawol c479fe45f3 Merge pull request #1452 from Markokil321/patch-2 
Update player_build.sqf
 2014-07-25 16:02:32 -05:00
vbawol 327e7677e7 Update 1.0.5_Updates.sql 2014-07-25 13:07:01 -05:00
[VB]AWOL b436c1a66f Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-07-25 12:07:42 -05:00
[VB]AWOL edf7c23af0 RedRyder BB Gun by @arma2WillRobinson 2014-07-25 12:07:38 -05:00
vbawol b26aa51e32 Merge pull request #1434 from arma2WillRobinson/master 
roughly added RedRyder BB Gun
 2014-07-25 12:05:47 -05:00
vbawol e6e5da011e Merge pull request #1453 from Markokil321/patch-4 
Update player_build2.sqf
 2014-07-25 12:04:30 -05:00
[VB]AWOL 9bc4a9a4ec Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch 2014-07-25 12:02:41 -05:00
[VB]AWOL f1950b0b99 @raziel23x pull request 2014-07-25 12:02:37 -05:00
vbawol f1aa986a08 Merge pull request #1451 from RimBlock/master 
Config files - Added fuel capacity variable.  DB Backup improved script.
 2014-07-25 12:00:52 -05:00
[VB]AWOL 4059c7ceaa [FIXED] Corrected ClassName for CH53_DZE and BAF_Merlin_DZE. @Cinjun 2014-07-25 11:59:53 -05:00
vbawol 377e5207ac Merge pull request #1454 from Cinjun/master 
Update 1.0.5_Updates.sql
 2014-07-25 11:57:20 -05:00
vbawol bbfd03dbf7 Merge pull request #1450 from raymix/master 
needs a better fix
 2014-07-23 10:52:12 -05:00
vbawol 5193787b5f Merge pull request #1445 from Markokil321/patch-2 
Update player_build.sqf
 2014-07-21 13:09:44 -05:00
vbawol 092223e2c3 Merge pull request #1444 from Markokil321/patch-4 
Update trade_weapons.sqf
 2014-07-21 13:09:32 -05:00
vbawol 14918b9892 Merge pull request #1429 from ebaydayz/patch-3 
Update CHANGE LOG 1.0.5.2.txt
 2014-07-21 12:04:29 -05:00
vbawol 3e388880d4 Merge pull request #1441 from SJossy/patch-1 
Update compiles.sqf
 2014-07-20 00:18:25 -05:00
vbawol 4099115959 Merge pull request #1439 from ebaydayz/patch-2 
Add CH53_DZE to config based traders
 2014-07-19 16:56:03 -05:00
vbawol 565b9240cf Merge pull request #1438 from ebaydayz/patch-1 
Use set instead of binary addition
 2014-07-19 16:55:50 -05:00
vbawol 6e1be89442 Merge pull request #1431 from raymix/master 
snap building plotpole / infinite drag fix
 2014-07-18 13:40:15 -05:00
vbawol 8294226d86 Merge pull request #1425 from ebaydayz/patch-1 
Fix nearestObjects position error
 2014-07-15 22:58:18 -05:00
vbawol 652160a080 Merge pull request #1421 from ebaydayz/patch-2 
Fix fire cleanup diag_log error
 2014-07-15 21:39:34 -05:00
vbawol fb151b961d Merge pull request #1420 from ebaydayz/patch-1 
Fix undefined variable "_weapon" error
 2014-07-15 21:39:14 -05:00
vbawol 60644c98b7 Merge pull request #1412 from f3cuk/patch-1 
Update 1.0.5_Updates.sql
 2014-07-15 21:38:40 -05:00
vbawol a487fd4f78 Merge pull request #1416 from raymix/master 
snap code optimization, vault points added
 2014-07-12 16:38:16 -05:00
vbawol 07b3f14c1b Merge pull request #1411 from hogscraper/test_branch 
Additional update to UI
 2014-07-11 14:28:14 -05:00
vbawol 83ec44e402 Merge pull request #1410 from raymix/master 
optional snap building added
 2014-07-11 14:27:40 -05:00
vbawol 7285b9e113 Merge pull request #1409 from Uro1/master 
Updated ChangeLog
 2014-07-10 13:57:05 -05:00
vbawol 14d866f2c6 Merge pull request #1408 from Uro1/master 
Fix for crash_spawner & supply_drop modules creating inaccesible loot piles
 2014-07-10 13:31:00 -05:00
vbawol 03e229bee5 Merge pull request #1400 from SilvDev/patch-1 
Update CHANGE LOG 1.0.5.2.txt
 2014-07-07 20:44:32 -05:00
vbawol 72168cb103 Merge pull request #1396 from justchil/patch-1 
Update zombie_generate.sqf
 2014-07-05 10:56:43 -05:00
vbawol 796490d955 Merge pull request #1391 from SilvDev/master 
Traders no longer equipped with weapon in hands
 2014-07-05 10:56:29 -05:00
vbawol c3522eb700 Merge pull request #1387 from ADK-DAYZMOD-EPOCH/master 
Updated Config examples
 2014-07-03 21:48:41 -05:00
vbawol 2aee27be43 Update CHANGE LOG 1.0.5.2.txt 2014-07-03 00:06:10 -05:00
vbawol cd794ba2b7 Update README.md 2014-07-03 00:04:41 -05:00