Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #744 from EpochModTeam/release

Browse Source 
sync changes from release to experimental
This commit is contained in:
vbawol 2017-04-17 09:21:44 -07:00 committed by GitHub
commit 4382aef326
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/epoch_code/System/player_login.fsm
View File

@ -1147,8 +1147,8 @@ class FSM
"diag_log _msg;" \n
"" \n
"_rejectPlayer = {" \n
" PLAYER_REJECT_InvaildSetup = true;" \n
" publicVariableServer ""PLAYER_REJECT_InvaildSetup"";" \n
" PLAYER_REJECT_InvalidSetup = true;" \n
" publicVariableServer ""PLAYER_REJECT_InvalidSetup"";" \n
"};"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links

2
Sources/epoch_server_settings/configs/maps/altis.h
View File

@ -232,7 +232,7 @@ class Altis : Default
{ "Land_ChairPlastic_F", { 6181.8, 16846.2, 0.00118256 }, 53.9327, true },
{ "Land_Axe_F", { 6197.86, 16835.8, -0.00292969 }, 246.133, true },
//tradercity 3
{ "Land_BarGate_F", { 18436.5, 14277, 0.10347 }, 58.0699, true },
{ "Land_BarGate_F", { 18436.5, 14277, 0.10347 }, 58.0699, false },
{ "Land_HBarrierBig_F", { 18440.4, 14268.3, 0.00117111 }, 60.1274, true },
{ "Land_HBarrierBig_F", { 18444.9, 14261, 0.00129318 }, 60.1036, true },
{ "Land_Mil_WiredFence_F", { 18440.6, 14268.7, 0.00332832 }, 62.0634, true },

4
Sources/epoch_server_settings/configs/maps/australia.h
View File

@ -56,7 +56,7 @@ class Australia : Default
{"Land_Slums02_4m", {19031.6, 33955.9, 0}, 1.81821},
{"Land_Slums02_4m", {19026.2, 33957.5, 0}, 94.0909},
{"Land_Slums02_4m", {19026.4, 33961.4, 0}, 94.0909},
{"Land_BarGate_F", {19026.1, 33968, -0.0194139}, 267.727},
{"Land_BarGate_F", {19026.1, 33968, -0.0194139}, 267.727, false},
{"Land_Slums02_4m", {19027.6, 33956, 0}, 1.81821},
{"Campfire_burning_F", {19037.5, 33971.2, 0}, 0},
{"Land_WoodPile_large_F", {19028.4, 33961.1, 0}, 0},
@ -220,7 +220,7 @@ class Australia : Default
{"Land_Communication_F", {4075.63, 19467.2, 0}, 0},
{"Land_BarGate_F", {4087.73, 19423.3, 0.0014801}, 90},
{"Land_BarGate_F", {4087.73, 19423.3, 0.0014801}, 90, false},
{"Land_Tank_rust_F", {4032.32, 19378, 0}, 0},

4
Sources/epoch_server_settings/configs/maps/bornholm.h
View File

@ -246,8 +246,8 @@ class Bornholm : Default
{ "Land_ClutterCutter_large_F", { 14121.2, 11324, 0 }, 0.12738 },
{ "Land_ClutterCutter_large_F", { 14120.6, 11335.4, 0 }, 0.163394 },
{ "Land_ClutterCutter_large_F", { 14103.3, 11340.8, 0 }, 0.389968 },
{ "Land_BarGate_F", { 14092.2, 11324.1, -0.0248566 }, 271.54 },
{ "Land_BarGate_F", { 14107.3, 11310.3, 0.237534 }, 5.83527 },
{ "Land_BarGate_F", { 14092.2, 11324.1, -0.0248566 }, 271.54, false },
{ "Land_BarGate_F", { 14107.3, 11310.3, 0.237534 }, 5.83527, false },
{ "Land_Cargo40_military_green_F", { 14096.3, 11342.9, 0.183029 }, 271.598 },
{ "Land_Cargo40_brick_red_F", { 14120.9, 11351.1, -0.00115967 }, 19.6872 },
{ "Land_HBarrierWall6_F", { 14100, 11351.7, -0.0260773 }, 315.035 },

2
Sources/epoch_server_settings/configs/maps/takistan.h
View File

@ -122,7 +122,7 @@ class Takistan : Default
{ "Land_Garbage_square3_F", {8653.31,8302.28,-0.00509644}, {{-0.999304,-0.015514,-0.0339228},{-0.0335713,-0.0223817,0.999186}}, true },
{ "Land_Bench_01_F", {8652.42,8302.73,0}, {{-0.98904,0.147649,0},{0,0,1}}, true },
{ "Land_d_Stone_HouseBig_V1_F", {9254.45,8821.8,1.16483}, {{-0.999001,0.0446854,0},{0,0,1}}, true },
{ "Land_Stone_Gate_F", {9266.31,8816.65,0.0163574}, {{0.998609,-0.0464501,0.0249342},{-0.0239894,0.0207879,0.999496}}, true },
{ "Land_Stone_Gate_F", {9266.31,8816.65,0.0163574}, {{0.998609,-0.0464501,0.0249342},{-0.0239894,0.0207879,0.999496}}, false },
{ "Land_Slums01_8m", {9257.59,8832.72,0.000457764}, {{-0.140746,-0.989733,-0.0248722},{-0.0191909,-0.0223902,0.999565}}, true },
{ "Land_Slums01_8m", {9260.63,8811.3,-0.00575256}, {{-0.0113376,0.99993,0.00350884},{0.0271895,-0.00319948,0.999625}}, true },
{ "Land_CarService_F", {5713.53,8895.49,0}, {{0.973764,0.227561,0},{0,0,1}}, true },

2
Sources/epoch_server_settings/configs/maps/tanoa.h
View File

@ -282,7 +282,7 @@ class Tanoa : Default
{ "Land_Razorwire_F", {2024.16,10643.8,-0.0291944}, {{0.514935,-0.849056,0.118091},{-0.0399685,0.11383,0.992696}}, true },
{ "Land_HBarrier_01_big_4_green_F", {2022.61,10644.7,-0.17352}, {{0.528829,-0.848728,0},{0,0,1}}, true },
{ "Land_HBarrier_01_big_4_green_F", {2015.36,10643.2,4.76837e-007}, {{0.135001,0.990846,0},{0,0,1}}, true },
{ "Land_NetFence_02_m_gate_v1_F", {2020.37,10664.9,0.0390873}, {{-0.395113,0.918633,0},{0,0,1}}, true },
{ "Land_NetFence_02_m_gate_v1_F", {2020.37,10664.9,0.0390873}, {{-0.395113,0.918633,0},{0,0,1}}, false },
{ "Land_Razorwire_F", {2030.13,10657.3,0.260143}, {{0.953535,-0.256933,0.15734},{-0.186028,-0.0913072,0.978293}}, true },
{ "Land_Razorwire_F", {2029.48,10664.7,-0.300159}, {{0.82649,0.505114,0.248545},{-0.318502,0.0555165,0.946295}}, true },
{ "Land_HBarrier_01_big_tower_green_F", {2013.94,10676.5,0.000588894}, {{-0.841341,-0.540258,0.0163131},{-0.0080009,0.0426263,0.999059}}, true },