W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-06-28 04:31:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1655 from ebaydayz/patch-6

Browse Source 
Update version numbers to 1.0.6 for next release.
This commit is contained in:
Zupa
2015-07-01 23:44:22 +02:00
parent f0782d9c89 8565bc78be
commit be8a9c9acc
26 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGE LOG 1.0.5.2.txt → CHANGE LOG 1.0.6.txt
View File
SQF/dayz_code/Configs/rscTitles.hpp
+2 -2
View File
@@ -181,7 +181,7 @@ class RscDisplayMain : RscStandardDisplay {
class CA_Version;
class DAYZ_Version : CA_Version {
idc = -1;
text = "1.0.5.2";
text = "1.0.6";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
};
delete CA_TitleMainMenu;
@@ -1025,4 +1025,4 @@ class DZ_ItemInteraction {
};
};
#include "RscDisplay\includes.hpp"
#include "RscDisplay\includes.hpp"
SQF/dayz_code/config.cpp
+2 -2
View File
@@ -41,7 +41,7 @@ class CfgMods
hidePicture = 0;
hideName = 0;
action = "http://www.dayzepoch.com";
version = "1.0.5.2";
version = "1.0.6";
hiveVersion = 0.96; //0.93
};
};
@@ -99,4 +99,4 @@ class CfgAddons
#include "Configs\CfgArma.hpp"
#include "Configs\CfgExtra\snappoints.hpp"
#include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.h"
#include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.h"
SQF/dayz_code/system/player_monitor.fsm
+2 -2
View File
@@ -1383,7 +1383,7 @@ class FSM
priority = 2.000000;
to="ERROR__version_c";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.5"") || (_myEpoch != ""1.0.4.2"") || (_myEpochB != ""1.0.5.2"") || (_myEpochSfx != ""1.0.5"") || (_myEpochDayZ != ""1.0.5"")"/*%FSM</CONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.5"") || (_myEpoch != ""1.0.4.2"") || (_myEpochB != ""1.0.6"") || (_myEpochSfx != ""1.0.5"") || (_myEpochDayZ != ""1.0.5"")"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1699,4 +1699,4 @@ class FSM
"Finish"
};
};
/*%FSM</COMPILE>*/
/*%FSM</COMPILE>*/
SQF/dayz_epoch_b/config.cpp
+2 -2
View File
@@ -3,7 +3,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = 0.1;
dayzVersion = "1.0.5.2";
dayzVersion = "1.0.6";
requiredAddons[] = {"dayz_code"};
};
};
};
SQF/mod.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
dir = "@DayZ_Epoch";
name = "DayZ Epoch 1.0.5.2";
name = "DayZ Epoch 1.0.6";
actionName = "Website";
picture = "dayz_logo_ca.paa";
action = "http://www.dayzepoch.com";
action = "http://www.dayzepoch.com";
Server Files/Config-Examples/instance_11_Chernarus/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Chernarus Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Chernarus Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_12_duala/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Isla Duala Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Isla Duala Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_13_tavi/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Taviana Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Taviana Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_15_namalsk/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Namalsk Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Namalsk Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_16_panthera/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Panthera Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Panthera Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_18_sahrani/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Sahrani Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Sahrani Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_19_poda/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Podagorsk Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Podagorsk Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_1_takistan/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Takistan Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Takistan Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_20_fapovo/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Fapovo Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Fapovo Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_21_caribou/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Caribou Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Caribou Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch SMD Sahrani Server (1.0.5.2/125548)";
hostName = "DayZ Epoch SMD Sahrani Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_24_Napf/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Napf Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Napf Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_25_sauerland/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Sauerland Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Sauerland Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_2_utes/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Utes Server (1.0.5.2/125548/No Traders)";
hostName = "DayZ Epoch Utes Server (1.0.6/125548/No Traders)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_3_shapur_baf/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Shapur BAF Server (1.0.5.2/125548/No Traders)";
hostName = "DayZ Epoch Shapur BAF Server (1.0.6/125548/No Traders)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_4_zargabad/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Zargabad Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Zargabad Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_6_Dingor/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Dingor Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Dingor Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_7_Lingor/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch Lingor Server (1.0.5.2/125548)";
hostName = "DayZ Epoch Lingor Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.5.2/125548)";
hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.6/125548)";
password = "";
passwordAdmin = "changeme";
maxPlayers = 50;
Server Files/Readme.txt
+1 -1
View File
@@ -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 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.
4. Inside the "Keys" folder on your server remove any previous day_epoch*.bikey keys. As of 1.0.6 our bikey is called dayz_epoch106.bikey and we will use a new one for each release.