W0LF/DayZ-Epoch

mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00

Go to file

ebaydayz fbedaf9b8d Remove merge conflict markers

@icomrade - I'm going to start reviewing and testing the commits you've
done here. I'll commit any fixes and additional 1.8.7 stuff that is
needed to this 1.8.7-Rebase branch. Once we have it in a functional
state we can merge it into master if that's good with you.

Let me know if you are working on any files in particular so we don't
duplicate efforts. I'll be in discord while I'm working here too.

2016-03-04 14:59:12 -05:00

did not make it in time

2014-06-25 11:41:30 -05:00

Fix Merge Conflict 1

2016-03-03 22:09:38 -05:00

Remove merge conflict markers

2016-03-04 14:59:12 -05:00

Update Test Build

2016-02-16 22:47:21 -05:00

typo

2014-07-27 23:17:00 -05:00

TraderCitySources

Add old files to TraderCitySources for reference

2016-03-01 01:08:23 -05:00

.gitattributes

0.1

2012-11-04 20:28:50 -06:00

.gitignore

Push

2014-02-11 20:46:39 +01:00

CHANGE LOG 1.0.6.txt

Add journal and preliminary strings for crafting

2016-03-03 20:11:11 -05:00

README.md

Updated Config examples

2014-07-03 22:44:52 -04:00

README.md

DayZ Epoch

Experimental DayZ mod

http://dayzepoch.com

Based on DayZ Mod Community edition

https://github.com/DayZMod/DayZ/blob/Release_1.8/Documentation/Credits.md http://dayzmod.com

Included Custom Addons

AutoGyro - by CSJ http://www.armaholic.com/page.php?id=2359
Taxi by [GLT]Myke http://www.armaholic.com/page.php?id=12289
Blackhawk and Seahawk Wrecks by [GLT]Myke http://www.armaholic.com/page.php?id=10670
SUV Colors by Python.au http://www.armaholic.com/page.php?id=17176
R3F Realism by http://www.team-r3f.org/
ASC EU Lights Mod http://www.armaholic.com/page.php?id=12076
MAP Editorupgrade (EU) http://www.armaholic.com/page.php?id=6194
st_movement by ShackTac https://dev-heaven.net/projects/shacktac/files
st_bunnyhop by ShackTac https://dev-heaven.net/projects/shacktac/files
Jetski Yanahui by Kol9yN, Zakat, Gerasimow9, YuraPetrov, zGuba, A.Karagod, IceBreakr and Sahbazz http://www.armaholic.com/page.php?id=13053
gdtmod_grass 1.00 by HeinBloed - http://www.gdt-server.net/
Bell 47/H-13 Helicopter by hcpookie - http://www.armaholic.com/page.php?id=22143
USEC CH53 by Rocket - http://dayz.com
More enterable buildings - Dayzero - https://zombies.nu/

Included Custom Islands

Sauerland by Falconsan - http://www.s6computer.de/
Napf Island by #momo# - http://forums.bistudio.com/showthread.php?136469-Napf-Island-beta
| MBG Killhouses http://www.armaholic.com/page.php?id=15180
| MBG Buildings 3 - European Theatre http://www.armaholic.com/page.php?id=14828
| MBG Generic African Buildings http://www.armaholic.com/page.php?id=17817
| German Town - and waysigns http://www.armaholic.com/page.php?id=9658

Initial Developers

[VB]AWOL - Lead Developer - http://www.twitch.tv/vbawol
Axle - Tester, Trader City Designer - http://www.twitch.tv/axles
Paul Tomany - Models, Textures - ptomany@gmail.com - http://www.twitch.tv/sequisha
[VB]GREEN - Graphics - http://www.twitch.tv/vbgreen

GitHub Collaborators (In order of most commits)

vbawol - https://github.com/vbawol
eltexonline - https://github.com/eltexonline
zabn - https://github.com/zabn
Sequisha - https://github.com/Sequisha
andgregor - https://github.com/andgregor
facoptere - https://github.com/facoptere
dayz10k - https://github.com/dayz10k
Skaronator - https://github.com/Skaronator
icomrade - https://github.com/icomrade
Axles - https://github.com/Axles
Armifer - https://github.com/Armifer

GitHub Contributors (In order of most commits)

vbawol - https://github.com/vbawol
dayz10k - https://github.com/dayz10k
Skaronator - https://github.com/Skaronator
Fank - https://github.com/Fank
andgregor - https://github.com/andgregor
Axles - https://github.com/Axles
zabn - https://github.com/zabn
eltexonline - https://github.com/eltexonline
icomrade - https://github.com/icomrade
Namindu - https://github.com/Namindu
raginruffalo - https://github.com/raginruffalo
Adaptivity - https://github.com/Adaptivity
facoptere - https://github.com/facoptere
ctcDNightmare - https://github.com/ctcDNightmare
SGanthony - https://github.com/SGanthony
Geodar - https://github.com/Geodar
Sandbird - https://github.com/Sandbird
krazey - https://github.com/krazey
jostster - https://github.com/jostster
SilvDev - https://github.com/SilvDev
AVendettaForYou - https://github.com/AVendettaForYou
Sequisha - https://github.com/Sequisha
Armifer - https://github.com/Armifer
infiSTAR - https://github.com/infiSTAR
Cornyfisch - https://github.com/Cornyfisch
JoSchaap - https://github.com/JoSchaap
maca134 - https://github.com/maca134
Schmoopiie - https://github.com/Schmoopiie
nahkiss - https://github.com/nahkiss
BlackLA - https://github.com/BlackLA
Hogscraper - https://github.com/hogscraper
Raziel23x - https://github.com/Raziel23x

Special thanks

BIS for a incredible and versatile game and engine. http://www.bistudio.com/
Rocket - DAYZ! http://dayzmod.com | http://dayzgame.com
DayZ Community Developers - https://github.com/DayZMod
ziellos2k - Tag Friendly code. https://github.com/ziellos2k
Dayz Hive DLL - https://github.com/rajkosto/hive
Munchiefest - Beta Tester, Wiki Editor, Ideas - http://www.twitch.tv/munchiefest
Chelsey - Beta Tester, New female textures.
OrangeSherbet - Beta Tester - http://www.twitch.tv/orangesherbet
QMGSaint - Beta Tester - http://www.twitch.tv/qmgsaint
Twitch.tv Streamers - http://www.twitch.tv/directory/game/DayZ
Thanks to all the other beta testers, you know who you are!