mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-14 12:12:34 +03:00
Merge branch 'RC1-1.0.5.2' of https://github.com/vbawol/DayZ-Epoch into DB_backup_script
Conflicts: SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
This commit is contained in:
Binary file not shown.
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Chernarus Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Chernarus Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Isla Duala Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Isla Duala Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Taviana Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Taviana Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Namalsk Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Namalsk Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Panthera Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Panthera Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Sahrani Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Sahrani Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Podagorsk Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Podagorsk Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Takistan Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Takistan Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Fapovo Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Fapovo Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Caribou Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Caribou Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch SMD Sahrani Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch SMD Sahrani Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Napf Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Napf Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Sauerland Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Sauerland Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Utes Server (1.0.5/103718/No Traders)";
|
||||
hostName = "DayZ Epoch Utes Server (1.0.5.2/125548/No Traders)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Shapur BAF Server (1.0.5/103718/No Traders)";
|
||||
hostName = "DayZ Epoch Shapur BAF Server (1.0.5.2/125548/No Traders)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 24;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Zargabad Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Zargabad Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Dingor Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Dingor Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch Lingor Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch Lingor Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.5/103718)";
|
||||
hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.5.2/125548)";
|
||||
password = "";
|
||||
passwordAdmin = "changeme";
|
||||
maxPlayers = 50;
|
||||
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
|
||||
onHackedData = "kick (_this select 0)";
|
||||
onDifferentData = "";
|
||||
regularCheck = "";
|
||||
requiredBuild = 103718;
|
||||
requiredBuild = 125548;
|
||||
requiredSecureId = 2;
|
||||
|
||||
class Missions
|
||||
|
||||
Binary file not shown.
BIN
Server Files/Keys/dayz_epoch1052.bikey
Normal file
BIN
Server Files/Keys/dayz_epoch1052.bikey
Normal file
Binary file not shown.
@@ -1332,8 +1332,6 @@ class Mission
|
||||
expCond="(player distance Seedorf) < 100;";
|
||||
expActiv="[""Boat Vendor"",true,""enter""] spawn player_traderCity;";
|
||||
expDesactiv="[""Boat Vendor"",true,""leave""] spawn player_traderCity;";
|
||||
expActiv="TitleText[""Now Entering Trader City Seedorf"",""PLAIN DOWN""]; canbuild = false;";
|
||||
expDesactiv="TitleText[""Now Leaving Trader City Seedorf"",""PLAIN DOWN""]; canbuild = true;";
|
||||
class Effects
|
||||
{
|
||||
};
|
||||
|
||||
@@ -20,4 +20,4 @@ Important Note: On some Windows systems you may need to "UnBlock" the dll files.
|
||||
|
||||
3. Connect to your mysql server using naicat or phpmyadmin and import the epoch.sql file found in the SQL folder. This will drop and re-add the traders tables and will leave everything else intact.
|
||||
|
||||
4. Inside the "Keys" folder on your server remove dayz_vb.bikey and dayz.bikey keys. As of 1.0.4 our bikey is called dayz_epoch104.bikey and we will use a new one for each release.
|
||||
4. Inside the "Keys" folder on your server remove any previous day_epoch*.bikey keys. As of 1.0.5.2 our bikey is called dayz_epoch1052.bikey and we will use a new one for each release.
|
||||
Reference in New Issue
Block a user