Skip to content

Commit

Permalink
Merge pull request #740 from DayZMod/Development
Browse files Browse the repository at this point in the history
DayzMod 1.8.8 Stable.
  • Loading branch information
R4Z0R49 authored Oct 8, 2016
2 parents f8fb820 + dfb199f commit d590291
Show file tree
Hide file tree
Showing 390 changed files with 13,063 additions and 35,493 deletions.
100 changes: 52 additions & 48 deletions Documentation/Credits.md
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
============
DayZ Community Developers
============
DayZ Mod Credits:

This file contains a list of every person who has contributed code to DayZ Mod. It was created from the git commit log, and should include everyone, but we may have missed a few and it is manually updated now. If you feel like you've been left out, feel free to tell us!
Community Dev Project Managers:
* [R4Z0R49] - (https://github.com/R4Z0R49)
* [AlbyBDPK] - (https://github.com/AlbyBDPK)

---------------
Original Author
---------------

* Dean 'Rocket' Hall

Community Dev Project Managers
---------------

* [R4Z0R49](https://github.com/R4Z0R49)
* [AlbyBDPK](https://github.com/AlbyBDPK)


-------------------------
Long-term Contributions
Current Contributions
-------------------------

These contributors have made many changes, over a fairly long time span, or
for many different parts of the code.

* kichilron (https://github.com/kichilron)
* [JST](https://github.com/Cybersam248)
* [DDesmond] (https://github.com/ddesmond)
* Skinkicker
* Maca
* Andrew
* William
* cyrq (https://github.com/cyrq)
* markus.ua (Russian Translations)
* Illetier (German Translations)

------------------------
Past Contributions
------------------------

These contributors have made specific changes for a particular bug fix or
feature.

These contributors have made many changes, over a fairly long time span, or for many different parts of the code.

* [Dienark7] ( https://github.com/Dienark7)
* [Skaronator](https://github.com/Skaronator)
* [ziellos2k](https://github.com/ziellos2k)
* [JoeysLucky22](https://github.com/JoeysLucky22)
* [AlexAFlorov](https://github.com/AlexAFlorov)
* [facoptere](https://github.com/facoptere)
* [icomrade](https://github.com/icomrade)
* [thevisad](https://github.com/thevisad)
* [DDesmond](https://github.com/ddesmond)
* [DDesmond] (https://github.com/ddesmond)
* [Sharkiller](https://github.com/Sharkiller) (Spanish Tranlations)
* [Defwen](https://github.com/Defwen) (Czech Translations)

------------------------
Short-term Contributions
------------------------

These contributors have made specific changes for a particular bug fix or feature.

* [[VB]AWOL](https://github.com/vbawol)
* [[VB]AWOL](https://github.com/vbawol)
* [Paul Tomany](https://github.com/Sequisha)
* [M1lkM8n](https://github.com/M1lkm8n)
* [JST](https://github.com/Cybersam248)
Expand All @@ -53,8 +53,8 @@ These contributors have made specific changes for a particular bug fix or featur
* [wriley](https://github.com/wriley)
* [fred41](https://github.com/fred41)
* [Killzone_kid](https://github.com/Killzonekid)
* [Alex Grosse (Inch)](http://opendayz.net/index.php?members/inch.1011/)
* [Sumrak](http://www.nightstalkers.cz/en_index_nc.php)
* [Alex Grosse (Inch)](http://opendayz.net/...bers/inch.1011/)
* [Sumrak](http://www.nightstal...en_index_nc.php)
* [f0rt](https://github.com/ashfor03)
* [Ayan4m1](https://github.com/Ayan4m1)
* [Rajko](https://github.com/rajkosto)
Expand All @@ -69,32 +69,36 @@ These contributors have made specific changes for a particular bug fix or featur
* [LordGoF](https://github.com/LordGoF)
* [soapmak3r](https://github.com/soapmak3r) (Background Music)
* [Hangender](https://github.com/hangender)
* [Purplish](https://github.com/Purplish)
* Aj (Leadz)
* Ander
* Shaueh

* Shauneh
* [Nick Chow] (https://github.com/Purplish)
* bittedanke (https://github.com/bittedanke) - fixing a problem with chances.
* ebaydayz (https://github.com/ebaydayz)
* xyberviri (https://github.com/xyberviri) - ((action_open_backpack_0.ogg - action_open_backpack_4.ogg), (action_open_inventory_0.ogg - action_open_inventory_4.ogg)) License Info - https://github.com/DayZMod/DayZ/issues/696

------------------------
Art Work
------------------------
* Alexander (G17 incombat Icon)
* [DDesmond](https://github.com/ddesmond)
* Alexander (G17 in-combat Icon)
* Des (Gender images & Gui icon's revamp)
* [JoeysLucky22](https://github.com/JoeysLucky22)
* [Elvaron](https://github.com/Elvaron)

------------------------
Special thanks.
------------------------
* Special thanks to TOPMO3 and GenesisCrys for the outstanding work with retexturing the Viral infected.
* Special thanks to David Foltyn for the support during the community build with his constent moaning and presure to do everything different :-).
* Special thanks to Matt Lightfoot for his incredible logic we all love to hate :-).
* Special thanks to shinkicker who has listened to all of the ideas and who has always been there to bounce ideas back and forth Thanks.
* Special thanks to Shacktac for his incredable work within the Arma 2 community.
* Special thanks to AWOL and Paul Tomany for sharing awesome features from DayZ Epoch.

Contributing
------------
Want to contribute?
Please contact R4Z0R49 on [http://dayzmod.com/forums/.](http://dayzmod.com/forum/)
You are missing? Contact Skaronator via [eMail](mailto:[email protected])!

* Special thanks to TOPMO3 and GenesisCrys for the outstanding work with retexturing the Viral infected.
* Special thanks to David Foltyn for the support during the community build with his constent moaning and presure to do everything different :-).
* Special thanks to Matt Lightfoot for his incredible logic we all love to hate :-).
* Special thanks to shinkicker who has listened to all of the ideas and who has always been there to bounce ideas back and forth Thanks.
* Special thanks to Shacktac for his incredable work within the Arma 2 community.
* Special thanks to AWOL and Paul Tomany for sharing awesome features from DayZ Epoch.
* Special thanks to JoeysLucky22 for the awesome art work.
* Special thanks to the Aftermath team for sharing features/models from Atfermath.
* Special thanks to BMRF, TMW, MUSTY for providing test machines before release.
* Special thanks to Lester for providing access to use his addon. MAP Editorupgrade (EU)

Want to contribute?
Please contact R4Z0R49 on http://dayzmod.com/forums/
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@

Current Version
==================================
- DayZMod Dev-b725dcd
- DayZMod Dev-1.8.8-2fc83af

Current License
=================================
https://steamcommunity.com/linkfilter/?url=https://www.bistudio.com/community/licenses/dayz-mod-license-share-alike

Files updated
------------
Expand Down

This file was deleted.

69 changes: 33 additions & 36 deletions SQF/Missions/dayz_1337.chernarus/init.sqf
Original file line number Diff line number Diff line change
@@ -1,51 +1,46 @@
//Server Settings
//Server settings
dayZ_instance = 1337; //Instance ID of this server
dayZ_serverName = "1337"; //Shown to all players in the bottom left of the screen (country code + server number)

//Add the insttance id of this server
dayZ_instance = 1337; // The instance
//Tag info this is shown to all players in the bottom left hand side of the screen
dayZ_serverName = "1337"; // Servername (country code + server number)

//Gamesettings
//Game settings
dayz_antihack = 0; // DayZ Antihack / 1 = enabled // 0 = disabled
dayz_antiWallHack = 1; //DayZ AntiWallhack / 1 = enabled // 0 = disabled, Adds items to the map to plug holes.
dayz_REsec = 1; // DayZ RE Security / 1 = enabled // 0 = disabled
dayz_enableRules = true; //Enables a nice little news/rules feed on player login (make sure to keep the lists quick).
dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkeys 1,2,3) False = enable animations, True = disable animations
dayz_POIs = true;
dayz_infectiousWaterholes = true;
dayz_ForcefullmoonNights = false; // Forces night time to be full moon.
dayz_randomMaxFuelAmount = 250; //Puts a random amount of fuel in all fuel stations.

//DayazMod Presets
//DayZMod presets
dayz_presets = "Vanilla"; //"Custom","Classic","Vanilla","Elite"

//Only need to edit if you running a custom server.
if ( dayz_presets == "Custom") then {
//Only need to edit if you are running a custom server.
if (dayz_presets == "Custom") then {
dayz_enableGhosting = true; //Enable disable the ghosting system.
dayz_ghostTimer = 30; //Sets how long in seconds a player must be dissconnected before being able to login again.
dayz_spawnselection = 1; //Turn on spawn selection 0 = random only spawns, 1 = Spawn choice based on limits
dayz_spawncarepkgs_clutterCutter = 2; //0 = loot hidden in grass, 1 = loot lifted and 2 = no grass
dayz_spawnCrashSite_clutterCutter = 2; // heli crash options 0 = loot hidden in grass, 1 = loot lifted and 2 = no grass
dayz_spawnInfectedSite_clutterCutter = 2; // infected base spawn... 0: loot hidden in grass, 1: loot lifted, 2: no grass
dayz_bleedingeffect = 3; //1= blood on the ground, 2= partical effect, 3 = both.
dayz_ForcefullmoonNights = false; // Forces night time to be full moon.
dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked.
dayz_ghostTimer = 30; //Sets how long in seconds a player must be disconnected before being able to login again.
dayz_spawnselection = 1; //Turn on spawn selection 0 = random only spawns, 1 = spawn choice based on limits
dayz_spawncarepkgs_clutterCutter = 2; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass
dayz_spawnCrashSite_clutterCutter = 2; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass
dayz_spawnInfectedSite_clutterCutter = 2; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass
dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both
dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked
dayz_nutritionValuesSystem = false; //Enables nutrition system

//not implmented yet.
dayz_classicBloodBagSystem = false; // removes all blood type bloodbags
dayz_classicBloodBagSystem = false; // removes all blood type bloodbags (not implmented yet)
};

//temp settings
//Temp settings
dayz_DamageMultiplier = 2; //1 - 0 = Disabled, anything over 1 will multiply damage. Damage Multiplier for Zombies.
dayz_maxGlobalZeds = 500; //Limit the total zeds server wide.
dayz_temperature_override = false; // Set to true to disable all temperature changes.


// DO NOT EDIT BELOW HERE //
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
diag_log 'dayz_preloadFinished reset';
dayz_preloadFinished=nil;
onPreloadStarted "diag_log [diag_tickTime, 'onPreloadStarted']; dayz_preloadFinished = false;";
onPreloadFinished "diag_log [diag_tickTime, 'onPreloadFinished']; if (!isNil 'init_keyboard') then { [] spawn init_keyboard; }; dayz_preloadFinished = true;";

onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;";
with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon

if (!isDedicated) then {
Expand Down Expand Up @@ -73,27 +68,29 @@ progressLoadingScreen 0.25;
initialized = true;

setTerrainGrid 25;

if (dayz_REsec == 1) then { call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\REsec.sqf"; };
if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\REsec.sqf";};
execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";

if (isServer) then {
execVM "\z\addons\dayz_server\system\server_monitor.sqf";
//Must be global spawned, So players dont fall thought buildings (might be best to spilt these to important, not important)
if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";};
};

if (dayz_POIs) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; };
//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important)
if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; };
// Lootable objects from CfgTownGeneratorDefault.hpp
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; };

if (!isDedicated) then {
if (dayz_infectiousWaterholes) then { execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf"; };
if (dayz_antihack != 0) then {
if (dayz_antiWallHack != 0) then {
//Enables Map Plug items
execVM "\z\addons\dayz_code\system\mission\chernarus\security\init.sqf";
//Enables Plant lib fixes
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\antihack.sqf";
};

// remove annoying benches
if (toLower(worldName) == "chernarus") then {
diag_log format["WARNING: Clearing Benches from %1",worldName];
diag_log "WARNING: Clearing annoying benches from Chernarus";
([4654,9595,0] nearestObject 145259) setDamage 1;
([4654,9595,0] nearestObject 145260) setDamage 1;
};
Expand All @@ -102,9 +99,9 @@ if (!isDedicated) then {
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
waituntil {scriptDone progress_monitor};
waitUntil {scriptDone progress_monitor};
cutText ["","BLACK IN", 3];
3 fadeSound 1;
3 fadeMusic 1;
endLoadingScreen;
};
};
1 change: 0 additions & 1 deletion SQF/Missions/dayz_1337.chernarus/keyboard.sqf

This file was deleted.

17 changes: 16 additions & 1 deletion SQF/Missions/dayz_1337.chernarus/mission.sqm
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,13 @@ class Mission
};
class Markers
{
items=8;
items=10;
class Item0
{
position[]={7839,0,8414};
name="center";
type="Empty";
a=7500;b=7000;
};
class Item1
{
Expand Down Expand Up @@ -225,6 +226,20 @@ class Mission
name="spawn5"; //spawn_berezino
type="Empty";
};
class Item8
{
position[]={7049,0,9241};
name="crashsites";
type="Empty";
a=4880;b=7000;
};
class Item9
{
position[]={7542,0,7134};
name="carepackages";
type="Empty";
a=6150;b=0;
};
};
};
class Intro
Expand Down
48 changes: 23 additions & 25 deletions SQF/Missions/dayz_1337.chernarus/rules.sqf
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
private ["_messages", "_timeout"];

private ["_messages","_timeout"];

if (isServer) exitWith {};
waitUntil { sleep 1; !isNil ("Dayz_loginCompleted") };

waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};

_messages = [
["DayZMod", "Welcome "+(name player)],
["World", worldName],
["Teamspeak", "Some ts info"],
["Website/Forums", "some website info"],
["Server Rules", "Duping, glitching or using any<br />exploit will result in a<br />permanent ban."],
["Server Rules", "No Talking in side."],
["Server Rules", "Hackers will be banned permanently<br />Respect others"],
["News", "Some random New info!<br />RandomNews<br />"]
["DayZMod", "Welcome "+(name player)],
["World", worldName],
["Teamspeak", "some TS info"],
["Website/Forums", "some website info"],
["Server Rules", "Duping, glitching or using any<br />exploit will result in a<br />permanent ban."],
["Server Rules", "No talking in side."],
["Server Rules", "Hackers will be banned permanently<br />Respect others"],
["News", "Some random new info!<br />Random news<br />"]
];

_timeout = 5;
{
private ["_title", "_content", "_titleText"];
sleep 2;
_title = _x select 0;
_content = _x select 1;
_titleText = format[("<t font='TahomaB' size='0.40' color='#a81e13' align='right' shadow='1' shadowColor='#000000'>%1</t><br /><t shadow='1'shadowColor='#000000' font='TahomaB' size='0.60' color='#FFFFFF' align='right'>%2</t>"), _title, _content];
[
_titleText,
[safezoneX + safezoneW - 0.8,0.50], //DEFAULT: 0.5,0.35
[safezoneY + safezoneH - 0.8,0.7], //DEFAULT: 0.8,0.7
_timeout,
0.5
] spawn BIS_fnc_dynamicText;
sleep (_timeout * 1.1);
private ["_title","_content","_titleText"];
uiSleep 2;
_title = _x select 0;
_content = _x select 1;
_titleText = format[("<t font='TahomaB' size='0.40' color='#a81e13' align='right' shadow='1' shadowColor='#000000'>%1</t><br /><t shadow='1'shadowColor='#000000' font='TahomaB' size='0.60' color='#FFFFFF' align='right'>%2</t>"), _title, _content];
[
_titleText,
[safezoneX + safezoneW - 0.8,0.50], //DEFAULT: 0.5,0.35
[safezoneY + safezoneH - 0.8,0.7], //DEFAULT: 0.8,0.7
_timeout,
0.5
] spawn BIS_fnc_dynamicText;
uiSleep (_timeout * 1.1);
} forEach _messages;
Loading

0 comments on commit d590291

Please sign in to comment.