From aed3e20bafab67c568f99200e1d1de2d3e325f9a Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 12 Apr 2016 10:53:39 -0500 Subject: [PATCH 1/7] fixed trailing slashes http://epochmod.com/forum/index.php?/topic/41841-trailing-in-0380417-0-gfbe10c3/ --- .../configs/CfgLootTable.h | 4 ++-- .../configs/CfgLootTable_CUP.h | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Sources/epoch_server_settings/configs/CfgLootTable.h b/Sources/epoch_server_settings/configs/CfgLootTable.h index 140722da..3a36b69a 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable.h @@ -165,7 +165,7 @@ class CfgLootTable { { "ItemAluminumBar", "magazine" }, 2 }, { { "ItemCopperBar", "magazine" }, 2 }, - { { "ItemTinBar", "magazine" }, 1 }, + { { "ItemTinBar", "magazine" }, 1 } }; }; @@ -733,7 +733,7 @@ class CfgLootTable { { "ItemSilverBar", "magazine" }, 20 }, { { "ItemCopperBar", "magazine" }, 20 }, { { "ItemAluminumBar", "magazine" }, 20 }, - { { "ItemTinBar", "magazine" }, 30 }, + { { "ItemTinBar", "magazine" }, 30 } }; }; class Gems diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h index 7c28ca54..4b2cf563 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h @@ -259,7 +259,7 @@ class CfgLootTable_CUP { { "lighter_epoch", "magazine" }, 1 }, { { "ItemAluminumBar", "magazine" }, 2 }, { { "ItemCopperBar", "magazine" }, 2 }, - { { "ItemTinBar", "magazine" }, 1 }, + { { "ItemTinBar", "magazine" }, 1 } }; }; class Primitive @@ -886,7 +886,7 @@ class CfgLootTable_CUP { { "CUP_lmg_m249_SQuantoon", "weapon" }, 1 }, { { "CUP_lmg_M60E4", "weapon" }, 1 }, { { "CUP_lmg_Mk48_des", "weapon" }, 1 }, - { { "CUP_lmg_Mk48_wdl", "weapon" }, 1 }, + { { "CUP_lmg_Mk48_wdl", "weapon" }, 1 } }; }; @@ -927,7 +927,7 @@ class CfgLootTable_CUP { { "200Rnd_556x45_M249", "magazine" }, 10 }, { { "150Rnd_93x64_Mag", "magazine" }, 10 }, { { "MachinegunAmmo_30Rnd_65x39_caseless_mag", "CfgLootTable" }, 20 }, - { { "CUP_MachinegunAmmo", "CfgLootTable" }, 23 }, + { { "CUP_MachinegunAmmo", "CfgLootTable" }, 23 } }; }; class CUP_MachinegunAmmo @@ -1018,7 +1018,7 @@ class CfgLootTable_CUP { { "hgun_ACPC2_F", "weapon" }, 10 }, { { "ruger_pistol_epoch", "weapon" }, 12 }, // CUP - { { "CUP_pistols", "CfgLootTable" }, 15 }, + { { "CUP_pistols", "CfgLootTable" }, 15 } }; }; class CUP_pistols @@ -1055,7 +1055,7 @@ class CfgLootTable_CUP // CUP { { "CUP_PistolAmmo", "CfgLootTable" }, 10 }, { { "CUP_ShotgunAmmo", "CfgLootTable" }, 5 }, - { { "CUP_SubMachinegunAmmo", "CfgLootTable" }, 5 }, + { { "CUP_SubMachinegunAmmo", "CfgLootTable" }, 5 } }; }; @@ -1196,7 +1196,7 @@ class CfgLootTable_CUP { { "bipod_02_F_hex", "item" }, 1 }, { { "bipod_03_F_blk", "item" }, 1 }, { { "bipod_03_F_oli", "item" }, 1 }, - { { "CUP_Bipods", "CfgLootTable" }, 2 }, + { { "CUP_Bipods", "CfgLootTable" }, 2 } }; }; class CUP_Bipods @@ -1221,7 +1221,7 @@ class CfgLootTable_CUP // Marksman DLC { { "Muzzles_338MarkDLC", "CfgLootTable" }, 1 }, { { "Muzzles_93mmgMarkDLC", "CfgLootTable" }, 1 }, - { { "CUP_Muzzles", "CfgLootTable" }, 8 }, + { { "CUP_Muzzles", "CfgLootTable" }, 8 } }; }; class CUP_Muzzles @@ -1244,7 +1244,7 @@ class CfgLootTable_CUP { { "CUP_muzzle_mfsup_SCAR_L", "item" }, 1 }, { { "CUP_muzzle_snds_SCAR_H", "item" }, 1 }, { { "CUP_muzzle_mfsup_SCAR_H", "item" }, 1 }, - { { "CUP_muzzle_snds_XM8", "item" }, 1 }, + { { "CUP_muzzle_snds_XM8", "item" }, 1 } }; }; @@ -1295,7 +1295,7 @@ class CfgLootTable_CUP { { "ItemSilverBar", "magazine" }, 20 }, { { "ItemCopperBar", "magazine" }, 20 }, { { "ItemAluminumBar", "magazine" }, 20 }, - { { "ItemTinBar", "magazine" }, 30 }, + { { "ItemTinBar", "magazine" }, 30 } }; }; class Gems From 33964589edc063f3a76127aa630339a00d9e7cf5 Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 12 Apr 2016 11:19:28 -0500 Subject: [PATCH 2/7] push mission convert tool --- Tools/PHP/ConvertMission2dto3d.php | 298 +++++++++++++++++++++++++++++ 1 file changed, 298 insertions(+) create mode 100644 Tools/PHP/ConvertMission2dto3d.php diff --git a/Tools/PHP/ConvertMission2dto3d.php b/Tools/PHP/ConvertMission2dto3d.php new file mode 100644 index 00000000..15a4c6d9 --- /dev/null +++ b/Tools/PHP/ConvertMission2dto3d.php @@ -0,0 +1,298 @@ +'Epoch Mod', + 'timeOfChanges'=>28800, + 'startWeather'=>0, + 'startWind'=>0, + 'startWaves'=>0, + 'forecastWeather'=>0, + 'forecastWind'=>0, + 'forecastWaves'=>0, + 'forecastLightnings'=>1.0, + 'year'=>2035, + 'month'=>6, + 'day'=>24, + 'hour'=>12, + 'minute'=>0, + 'startFogDecay'=>0.013, + 'forecastFogDecay'=>0.013 + ), + $playerCount = 100, + $groups = array ( + 'Item0' => array ( + 'side'=>'CIV', + 'Vehicles' => array ( + 'Item0' => array ( + 'position'=> array(4331.02,0,148.62354), + ) + ) + ) + ), + $markers = array ( + + 'Item0' => array ( + 'position' => array (4135.0137,0,4039.3584), + 'name'=>"center", + 'type'=>"Empty", + ), + 'Item1' => array ( + 'position' => array (4331.02,0,148.62354), + 'name'=>"respawn_east", + 'type'=>"Empty", + ), + 'Item2' => array ( + 'position' => array (4331.02,0,148.62354), + 'name'=>"respawn_west", + 'type'=>"Empty", + ), + 'Item3' => array ( + 'position' => array (3257.1497,0,1079.2324), + 'name'=>"south", + 'type'=>"Empty", + ), + 'Item4' => array ( + 'position' => array (3154.1616,0,5169.5229), + 'name'=>"east", + 'type'=>"Empty", + ) + + ) + ) + { + $this->addOns = $addOns; + $this->addOnsAuto = $addOnsAuto; + $this->randomSeed = $randomSeed; + $this->intel = $intel; + $this->playerCount = $playerCount; + $this->groups = $groups; + $this->markers = $markers; + } + + + + +} // end of class Mission + + + + +?> +
+ $val) {
+	    if (!is_array($val)) {
+	    	echo "\t$prop = $val\n";	
+	    } else {
+	    	echo "\t$prop = \n";	
+			print_r($val);
+	    }
+	}
+}
+
+function print_methods($obj) 
+	{
+	$arr = get_class_methods(get_class($obj));
+	foreach ($arr as $method) {
+	    echo "\tfunction $method()\n";
+	}
+}
+
+function class_parentage($obj, $class) 
+{
+	if (is_subclass_of($GLOBALS[$obj], $class)) {
+	    echo "Object $obj belongs to class " . get_class($GLOBALS[$obj]);
+	    echo ", a subclass of $class\n";
+	} else {
+	    echo "Object $obj does not belong to a subclass of $class\n";
+	}
+}
+
+// instantiate 2 objects
+$mission = new Mission();
+
+// print out information about objects
+// echo "CLASS " . get_class($mission) . "\n";
+
+// show mission properties
+ //echo "\nmission: Properties\n";
+ //print_vars($mission);
+
+echo "version=51;
+class EditorData
+{
+	moveGridStep=1;
+	angleGridStep=0.2617994;
+	scaleGridStep=1;
+	autoGroupingDist=10;
+	toggles=1;
+	class ItemIDProvider
+	{
+		nextID=2;
+	};
+	class Camera
+	{
+		pos[]={7542.4932,93.791428,15492.986};
+		dir[]={-0.8989169,-0.17364819,-0.40223712};
+		up[]={-0.15850332,0.98480779,-0.070925266};
+		aside[]={-0.40844229,0,0.91278416};
+	};
+};
+binarizationWanted=0;
+";
+
+
+
+echo "addons[]=
+{
+";
+foreach ($mission->addOnsAuto as $key => $value) {
+    if (is_string($value)) {
+		echo "	\"$value\",\n";
+    } else {
+    	echo "	$value,\n";
+    }
+    	
+}
+echo "};\n";
+
+
+echo "randomSeed=$mission->randomSeed;\n";
+echo "class ScenarioData
+{
+	author=\"[VB]AWOL\";
+};\n";
+
+
+
+echo "class Mission
+{
+	class Intel
+	{
+";
+foreach ($mission->intel as $key => $value) {
+    if (is_string($value)) {
+		echo "		$key=\"$value\";\n";
+    } else {
+    	echo "		$key=$value;\n";
+    }
+    	
+}
+echo "	};\n";
+
+$EntitiesCounter = 0;
+
+echo "	class Entities
+	{
+";
+echo "		items=". (count($mission->markers) + $mission->playerCount) .";\n";
+
+foreach ($mission->markers as $key => $value) {
+	
+	$position = implode(",", $value["position"]);
+    echo "		class Item".$EntitiesCounter."
+		{
+			dataType=\"Marker\";
+			position[]={".$position."};
+			name=\"".$value["name"]."\";
+			type=\"".$value["type"]."\";
+			id=".$EntitiesCounter.";
+		};\n";
+	$EntitiesCounter++;
+    	
+}
+
+for ($x = count($mission->markers); $x <= ($mission->playerCount+count($mission->markers)); $x++) {
+
+	foreach ($mission->groups as $key => $value) {
+		
+		$position = implode(",", $value["Vehicles"]["Item0"]["position"]);
+	    echo "		class Item".$x."
+		{
+			dataType=\"Group\";
+			side=\"Civilian\";
+			class Entities
+			{
+				items=1;
+				class Item0
+				{
+					dataType=\"Object\";
+					class PositionInfo
+					{
+						position[]={".$position."};
+						angles[]={0,4.7169838,0};
+					};
+					side=\"Civilian\";
+					flags=3;
+					class Attributes
+					{
+						isPlayable=1;
+					};
+					id=".($EntitiesCounter+1).";
+					type=\"VirtualMan_EPOCH\";
+				};
+			};
+			class Attributes
+			{
+			};
+			id=".$EntitiesCounter.";
+		};\n";
+		$EntitiesCounter++;
+		$EntitiesCounter++;
+	    	
+	}
+} 
+
+
+
+// Entities end
+echo "	};\n";
+
+
+
+
+// final 
+echo "};\n";
+
+?>
+
+ + + +'; \ No newline at end of file From 2c2dc9adcb58b80097d4024ed4c902db0597102d Mon Sep 17 00:00:00 2001 From: vbawol Date: Thu, 14 Apr 2016 11:10:35 -0500 Subject: [PATCH 3/7] 0.3.8.0423 attempt at preloading sapper by spawning one on the map at server start cleanup and change to github markdown for credits and license --- CREDITS.md | 48 +++++++++++++++++++ CREDITS.txt | 29 ----------- LICENSE.md | 4 ++ LICENSE.txt | 9 ---- README.md | 20 ++------ .../epoch_config/Configs/CfgEpochClient.hpp | 2 +- Sources/epoch_config/build.hpp | 2 +- Sources/epoch_server/build.hpp | 2 +- Sources/epoch_server/init/server_init.sqf | 5 ++ Sources/epoch_server_core/build.hpp | 2 +- Sources/epoch_server_settings/build.hpp | 2 +- build.txt | 2 +- 12 files changed, 67 insertions(+), 60 deletions(-) create mode 100644 CREDITS.md delete mode 100644 CREDITS.txt create mode 100644 LICENSE.md delete mode 100644 LICENSE.txt diff --git a/CREDITS.md b/CREDITS.md new file mode 100644 index 00000000..d1fa3e4a --- /dev/null +++ b/CREDITS.md @@ -0,0 +1,48 @@ +## [Epoch Projects](http://epochmod.com) by Epoch Mod Team for [Arma 3](https://arma3.com/) + + +### [Epoch Survival Gamemode](https://github.com/EpochModTeam/Epoch) + +* [Aaron Clark ([VB]AWOL)](http://epochmod.com): Code +* Kenneth Bente (Axle): Tester +* [Andrew Gregory (Axeman)](http://thefreezer.co.uk): Code, AI +* Raimonds Virtoss (Raymix): Code, UI +* [Niklas Wagner (Skaronator)](https://skaronator.com): Code + +### [Epoch Server DB extension (DLL / so)](https://github.com/EpochModTeam/EpochServer) + +* [Aaron Clark ([VB]AWOL)](http://epochmod.com): Code +* Florian Kinder (Fank): Code +* Denis Erygin (devd): Linux Support + +### [Epoch Server SQF Persistence Framework](https://github.com/EpochModTeam/EpochServerCore) + +* [Aaron Clark ([VB]AWOL)](http://epochmod.com): Code +* Florian Kinder (Fank): DLL Code + +### [Epoch Mod](http://steamcommunity.com/sharedfiles/filedetails/?id=421839251) + +* [Aaron Clark ([VB]AWOL)](http://epochmod.com): Configs, Textures +* Kenneth Bente (Axle): Models +* Paul Tomany (Sequisha): Models, Textures +* Darren Harrison (Kiory): Models, Textures +* Paden Sturtevant (SteamPunkGears): Models, Textures +* Damian Clark ([VB]GREEN): Graphics + +#### Contributors + +* Dan (OrangeSherbet): Tester, Videos, Wiki Editor +* [Poulmba](https://www.youtube.com/user/poulmba): Wiki Editor, Tester +* Richie: Map Support, Forum Moderator +* [Tobias Solem](http://whatthepoch.com/): Tester + +#### Special Thanks! + +* [Bohemia Interactive](http://bistudio.com) for an incredible and versatile game engine. +* Top Donors: dean4310, Robio, rhinoCRUNCH, B3nzi, Madman2077 +* [GTXGaming](http://www.gtxgaming.co.uk) - Dedicated Dev Server +* [Survival Servers](https://www.survivalservers.com) - Dedicated Dev Server +* [Vilayer](https://www.vilayer.com) - Dedicated Dev Server +* [Nitrado](https://server.nitrado.net) - Dedicated Dev Server +* [Vert Hosting](https://verthosting.com) - Shared Arma 2 and 3 Dev servers. +* Also a thanks goes to all the testers and supporters we missed, you know who you are! diff --git a/CREDITS.txt b/CREDITS.txt deleted file mode 100644 index 0b2b9ee5..00000000 --- a/CREDITS.txt +++ /dev/null @@ -1,29 +0,0 @@ -=== Epoch Mod Credits === -The entire Epoch Mod Team wants to thank all those that have helped along the way! - -== Contributors == -Poul Andersen - Poulmba - Wiki Editor - https://www.youtube.com/user/poulmba -Tobias Solem - - Tester / Server Host - http://whatthepoch.com/ -More TBA - -== Top Donators to EpochMod.com == -GTXGAMING -SurvivalServers.com -dean4310 -Robio -rhinoCRUNCH -B3nzi -Madman2077 -Axle -orangesherbet - -== Active GSP Supporters == -GTXGaming - Dedicated Server - http://www.gtxgaming.co.uk -Survival Servers - Dedicated Server - https://www.survivalservers.com -Vilayer - Dedicated Server - https://www.vilayer.com -Nitrado - Dedicated Server - https://server.nitrado.net -Vert Hosting - Shared Arma 2 and 3 servers - https://verthosting.com - -== Past GSP Supporters == -Gportal - Dedicated Server - https://www.g-portal.com -Arctic Servers - Shared Arma 3 server - http://arcticservers.co.uk diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..3745341a --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,4 @@ +[Epoch Mod](http://epochmod.com) for [Arma 3](http://arma3.com) by [Epoch Mod Team](https://github.com/EpochModTeam/Epoch) + +The contents of this github are under the following license: +http://www.bistudio.com/community/licenses/arma-public-license-share-alike diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 4cc4615e..00000000 --- a/LICENSE.txt +++ /dev/null @@ -1,9 +0,0 @@ -Epoch Mod for Arma 3 -http://epochmod.com -by Epoch Mod Team -https://github.com/EpochModTeam/Epoch - -The contents of this github are under the following license: -http://www.bistudio.com/community/licenses/arma-public-license-share-alike - -Keep this file and file headers with attribution intact for proper use. \ No newline at end of file diff --git a/README.md b/README.md index decaba49..98e84552 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -Arma 3 Epoch +Epoch Survival Gamemode for Arma 3 ===== http://epochmod.com -This github is for the latest server files, public bug reports, and feedback related to A3 Epoch. +This github is for the latest server files, public bug reports, and feedback related to the Epoch Survival gamemode for Arma 3. Lastest Stable Server Files: https://github.com/EpochModTeam/Epoch/releases @@ -13,18 +13,6 @@ License: Arma Public License Share Alike (APL-SA). http://www.bistudio.com/community/licenses/arma-public-license-share-alike -Developers +Credits: ===== -* Aaron Clark - [VB]AWOL - Game Design, Code -* Kenneth Bente - Axle - Public Relations -* Paul Tomany - Sequisha - Models, Textures -* Dan - OrangeSherbet - Tester, Videos, Wiki Editor -* Darren Harrison - Kiory - Models, Textures -* Damian Clark - [VB]GREEN - Graphics -* Niklas Wagner - Skaronator - Code - https://skaronator.com -* Andrew Gregory - Axeman - AI Code - http://thefreezer.co.uk -* Florian Kinder - Fank - DLL Code -* Denis Erygin - devd - Linux DLL Support -* Richie - Map Support -* SteamPunkGears - Models -* Raymix - UI and Code +https://github.com/EpochModTeam/Epoch/CREDITS.md diff --git a/Sources/epoch_config/Configs/CfgEpochClient.hpp b/Sources/epoch_config/Configs/CfgEpochClient.hpp index bb050d06..812338e5 100644 --- a/Sources/epoch_config/Configs/CfgEpochClient.hpp +++ b/Sources/epoch_config/Configs/CfgEpochClient.hpp @@ -21,7 +21,7 @@ class CfgEpochClient buildingRequireJammer = 0; // 1 = to allow building without a jammer buildingCountLimit = 200; // how many objects can be built within range of a jammer buildingJammerRange = 75; // jammer range in meters - disableRemoteSensors = true; // 1 = disableRemoteSensors true, 0 = disableRemoteSensors false + disableRemoteSensors = true; // disableRemoteSensors true EPOCH_news[] = {"Word is that Sappers have a new boss.","Dogs will often lure them monsters away.","My dog was blown up. I miss him.."}; antagonistSpawnIndex[] = { {"Epoch_Cloak_F", 1}, // {"type", limit} diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index 4cb1a87a..da1b404b 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=422; +build=423; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index 4cb1a87a..da1b404b 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=422; +build=423; diff --git a/Sources/epoch_server/init/server_init.sqf b/Sources/epoch_server/init/server_init.sqf index a3c5bd04..ca5d2f12 100644 --- a/Sources/epoch_server/init/server_init.sqf +++ b/Sources/epoch_server/init/server_init.sqf @@ -209,4 +209,9 @@ missionNamespace setVariable ["EPOCH_taxRate", [_serverSettingsConfig, "taxRate" // start accepting logins missionNamespace setVariable ["EPOCH_SERVER_READY", true, true]; +// spawn a single sapper to preload +_sapper = createAgent ["Epoch_Sapper_F", [0,0,0], [], 0, "CAN_COLLIDE"]; +_sapper setDamage 1; +_sapper enableSimulationGlobal false; + diag_log format ["Epoch: Server Start Complete: %1 seconds",diag_tickTime-_startTime]; diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index 4cb1a87a..da1b404b 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=422; +build=423; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index 4cb1a87a..da1b404b 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=422; +build=423; diff --git a/build.txt b/build.txt index 2e5658d0..db83efa6 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -422 +423 From 31340f7b246923c9e75d1acf3500447529f42b46 Mon Sep 17 00:00:00 2001 From: vbawol Date: Thu, 14 Apr 2016 11:15:26 -0500 Subject: [PATCH 4/7] same --- CREDITS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CREDITS.md b/CREDITS.md index d1fa3e4a..a4327245 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,4 +1,4 @@ -## [Epoch Projects](http://epochmod.com) by Epoch Mod Team for [Arma 3](https://arma3.com/) +## [Epoch Projects](https://github.com/EpochModTeam) by [Epoch Mod Team](https://github.com/orgs/EpochModTeam/people) for [Arma 3](https://arma3.com/) ### [Epoch Survival Gamemode](https://github.com/EpochModTeam/Epoch) From c40b4a2d9eb3ae90ea02be83d384a22acd626006 Mon Sep 17 00:00:00 2001 From: vbawol Date: Thu, 14 Apr 2016 16:14:26 -0500 Subject: [PATCH 5/7] more links for credits --- CREDITS.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index a4327245..2acd8214 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -4,34 +4,34 @@ ### [Epoch Survival Gamemode](https://github.com/EpochModTeam/Epoch) * [Aaron Clark ([VB]AWOL)](http://epochmod.com): Code -* Kenneth Bente (Axle): Tester * [Andrew Gregory (Axeman)](http://thefreezer.co.uk): Code, AI -* Raimonds Virtoss (Raymix): Code, UI +* [Raimonds Virtoss (Raymix)](https://www.twitch.tv/raymich): Code, UI * [Niklas Wagner (Skaronator)](https://skaronator.com): Code +* [Kenneth Bente (Axle)](www.twitch.tv/axles): Tester ### [Epoch Server DB extension (DLL / so)](https://github.com/EpochModTeam/EpochServer) * [Aaron Clark ([VB]AWOL)](http://epochmod.com): Code -* Florian Kinder (Fank): Code -* Denis Erygin (devd): Linux Support +* [Florian Kinder (Fank)](https://github.com/Fank): Code +* [Denis Erygin (devd)](https://github.com/denisio): Linux Support ### [Epoch Server SQF Persistence Framework](https://github.com/EpochModTeam/EpochServerCore) * [Aaron Clark ([VB]AWOL)](http://epochmod.com): Code -* Florian Kinder (Fank): DLL Code +* [Florian Kinder (Fank)](https://github.com/Fank): DLL Code ### [Epoch Mod](http://steamcommunity.com/sharedfiles/filedetails/?id=421839251) * [Aaron Clark ([VB]AWOL)](http://epochmod.com): Configs, Textures -* Kenneth Bente (Axle): Models -* Paul Tomany (Sequisha): Models, Textures -* Darren Harrison (Kiory): Models, Textures -* Paden Sturtevant (SteamPunkGears): Models, Textures +* [Kenneth Bente (Axle)](www.twitch.tv/axles): Tester, Models +* [Paul Tomany (Sequisha)](https://www.twitch.tv/sequisha): Models, Textures +* [Darren Harrison (Kiory)](https://www.twitch.tv/kiory123): Models, Textures +* [Paden Sturtevant (SteamPunkGears)](https://www.twitch.tv/steampunkgears): Models, Textures * Damian Clark ([VB]GREEN): Graphics #### Contributors -* Dan (OrangeSherbet): Tester, Videos, Wiki Editor +* [Dan (OrangeSherbet)](https://www.twitch.tv/OrangeSherbet): Tester, Videos, Wiki Editor * [Poulmba](https://www.youtube.com/user/poulmba): Wiki Editor, Tester * Richie: Map Support, Forum Moderator * [Tobias Solem](http://whatthepoch.com/): Tester From cd588f12727d32833bd8635b2a87f4c313fb5610 Mon Sep 17 00:00:00 2001 From: vbawol Date: Thu, 14 Apr 2016 16:16:21 -0500 Subject: [PATCH 6/7] cleanup --- CREDITS.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index 2acd8214..273f38dd 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -4,8 +4,8 @@ ### [Epoch Survival Gamemode](https://github.com/EpochModTeam/Epoch) * [Aaron Clark ([VB]AWOL)](http://epochmod.com): Code -* [Andrew Gregory (Axeman)](http://thefreezer.co.uk): Code, AI -* [Raimonds Virtoss (Raymix)](https://www.twitch.tv/raymich): Code, UI +* [Andrew Gregory (Axeman)](http://thefreezer.co.uk): AI Code +* [Raimonds Virtoss (Raymix)](https://www.twitch.tv/raymich): UI Code * [Niklas Wagner (Skaronator)](https://skaronator.com): Code * [Kenneth Bente (Axle)](www.twitch.tv/axles): Tester @@ -13,20 +13,20 @@ * [Aaron Clark ([VB]AWOL)](http://epochmod.com): Code * [Florian Kinder (Fank)](https://github.com/Fank): Code -* [Denis Erygin (devd)](https://github.com/denisio): Linux Support +* [Denis Erygin (devd)](https://github.com/denisio): Linux Code Support ### [Epoch Server SQF Persistence Framework](https://github.com/EpochModTeam/EpochServerCore) * [Aaron Clark ([VB]AWOL)](http://epochmod.com): Code -* [Florian Kinder (Fank)](https://github.com/Fank): DLL Code +* [Florian Kinder (Fank)](https://github.com/Fank): Code ### [Epoch Mod](http://steamcommunity.com/sharedfiles/filedetails/?id=421839251) * [Aaron Clark ([VB]AWOL)](http://epochmod.com): Configs, Textures -* [Kenneth Bente (Axle)](www.twitch.tv/axles): Tester, Models * [Paul Tomany (Sequisha)](https://www.twitch.tv/sequisha): Models, Textures * [Darren Harrison (Kiory)](https://www.twitch.tv/kiory123): Models, Textures * [Paden Sturtevant (SteamPunkGears)](https://www.twitch.tv/steampunkgears): Models, Textures +* [Kenneth Bente (Axle)](www.twitch.tv/axles): Tester, Models * Damian Clark ([VB]GREEN): Graphics #### Contributors From 646e468d43ea9fb290f8563c8d99418614ef5c85 Mon Sep 17 00:00:00 2001 From: vbawol Date: Sun, 17 Apr 2016 06:13:45 -0500 Subject: [PATCH 7/7] 0.3.8.0424 --- Changelogs/0.3.8.0.txt | 6 +++++- .../@epochhive/addons/a3_epoch_server.pbo | Bin 387545 -> 387714 bytes .../addons/a3_epoch_server_settings.pbo | Bin 396563 -> 396552 bytes .../@epochhive/addons/epoch_server_core.pbo | Bin 12329 -> 12329 bytes Server_Install_Pack/MPMissions/epoch.Napf.pbo | Bin 910052 -> 910016 bytes .../mpmissions/epoch.Altis.pbo | Bin 910085 -> 910049 bytes .../mpmissions/epoch.Australia.pbo | Bin 908313 -> 908277 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 909400 -> 909364 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 909247 -> 909211 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 909221 -> 909185 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 909228 -> 909192 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 909373 -> 909337 bytes .../mpmissions/epoch.Esseker.pbo | Bin 909213 -> 909177 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 909640 -> 909604 bytes .../mpmissions/epoch.Porto.pbo | Bin 909364 -> 909328 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 909375 -> 909339 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 909637 -> 909601 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 909639 -> 909603 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 909642 -> 909606 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 909367 -> 909331 bytes .../mpmissions/epoch.Stratis.pbo | Bin 909221 -> 909185 bytes .../mpmissions/epoch.Takistan.pbo | Bin 909329 -> 909293 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 909213 -> 909177 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 909640 -> 909604 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 909297 -> 909261 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 909360 -> 909324 bytes Sources/epoch_config/build.hpp | 2 +- Sources/epoch_server/build.hpp | 2 +- .../EPOCH_server_loadTraders.sqf | 2 +- Sources/epoch_server_core/build.hpp | 2 +- Sources/epoch_server_settings/build.hpp | 2 +- build.txt | 2 +- 32 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Changelogs/0.3.8.0.txt b/Changelogs/0.3.8.0.txt index 5bfd84c9..9d639345 100644 --- a/Changelogs/0.3.8.0.txt +++ b/Changelogs/0.3.8.0.txt @@ -43,7 +43,11 @@ [Info] Some AI Scripts Mods may not work with disableRemoteSensors enabled. You can disable with "disableRemoteSensors = false;" in CfgEpochClient. [Info] Removed old .bikey and added new one for 0380. -Build: 422 +Build: 424 +[Changed] Preloading sapper by spawning one on the map at server start. +[Changed] Change to github markdown for credits and license. +[Fixed] Green Marked traders unable to be accessed. +[Fixed] Trailing commas in CfgLootTable. [Fixed] Disallow building inside of vehicles. [Fixed] Incorrectly enabled CUP vehicles and weapons support if only Core and Maps where enabled. [Fixed] removeExec Battleye kick fixed. diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 21c080a245f2eccef335188a4300f22871c1a7d6..e52d0a0f28d950ef2b3aded7d97da21e51b1a3a8 100644 GIT binary patch delta 276 zcmcb4S-k10_yiwjr99z{{u=zO;(5a1Pd3-^o3b&h<_S;UB3i;$Tgw|Bqc~Yl>@Ty4 zwZddY<G z>lj0}&;QRfUnNvuU!k}lu{=*9QK2|9FFhw!p*XRiAhk%LBwwMRC^aWPF@={a9x7(5 zkX)3SSd!|Po|;#p5Uu1|ke{3p9}LzI@1~@q5N)6Xgt5~%&SR98fodvFEpbWAO-xT! zFtmmnHC^B(qr&v_(M&S!5h~0;%(6W~g*Er6NaUrG4KBvN^EBe>YQE>JO}w~%zCHj= CIbae1 delta 146 zcmV;D0B!$*)fd^*7m!Q?TKx>MPbd!s+z#wk>9c$fH3kD*{S1?|6?6y*5(!tXAOHZD z!4Cr=lTjAh12Q`xlOZEjgM$~hgBJlg! zFgP@~J^upyB$v!v0vd+_B?E^6B?PwtB?WE86!ow@jy5AOtrlrLbg47N8&&ExK_)RY AGXMYp diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo index 9160503f5845a28c989a97eb6631005ae185f8ff..32eabb11ae26cfbe41a5ffa798cd9e04a70458e8 100644 GIT binary patch delta 303 zcmbO{OQK_z#DowBjXdFS7X}7~q|(fs6upds0w5a!)Pb_RKyGq=URq|lUNV|AQ1iqo z8mx~cdBd$I9@Jue1Z2$G_`#k{+``=0(A-SPnwP5I-ewHlAV6s5ANEPLa*mi`0|A;#YSHY!-LM9j0r4^I@=BP7`O3&6-sRX zZ^g*V%B;i71=J?7UCn_}R2V7~9L%_jiBV@dP_^WCwJ^p;=E)aQ!4_@b8_Bo;Xb{w< vHi!1_^B94c35c12m}UF-d8~hPMP}UDt(1LRy7K#;tsYUkFUpx5=hg=Rwqa$G diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo index 4039492df7ba596c92e3659abaf84cccf1815379..ec1366052e3367f70d79bba80edd733b26fb9fcf 100644 GIT binary patch delta 75 zcmV-R0JQ(9V5wk`MFuEt6ITrYlR*L_v2JSu11fG4liUJA0W`B81Lr9LsIvzx#sLL5 hH#0Fev(hd@0TkLWFIpL7>dY}iQ+!fh8yZ6om|}Nb7p4FJ delta 75 zcmV-R0JQ(9V5wk`MFw8|3|9>RlR*L_v2JSu17Q6OliUJA0Wz~61Lr9Lrn3hv#sLL1 hH8C(av(hd@0TeS-?3`?Wfs&vcr(R>B0Y~mKDuLdt8o>Yn diff --git a/Server_Install_Pack/MPMissions/epoch.Napf.pbo b/Server_Install_Pack/MPMissions/epoch.Napf.pbo index 64aec3aaa43df5d96334e1103a19eddb1ce19247..7906591d4683da64f8d70356d8766891e0766ed7 100644 GIT binary patch delta 172 zcmaEI)cn9v^9g3mK6%0$EjvuuwDW|+c^M{ew33>vZz{R@mx(45YX)C9t1M7RZL^>G zCpI<d|b~iglAZ7w$W*}w(V%F_$c5Hvlm`$t|raOLQcAjo9n?+$dcMTg) z`<7BRAZ7<*4j|^-zNM6__WpFiP;OD?lA_Y~+)!>H=GmSb%A4FPvZW#XD+^2CAF~Pn OdrbWgo{MTq@df}wZak6z delta 194 zcmX?b)cna&^9g3mjemJIT6UPQCH&1r z;%b}y%s;WQnV1?H8W}db*|odbF#<6Y5HkZY3lOtzce7*rW5#S`tuWp3BeU~#gV`(! z)46Ndc-ps=vH>wW5OV-A=k_h7T($R^4Hays8-#L8vFRunDA+1Y7YyYVWl2lSDQ@=+ kBu7>q@ciA+uS>Jf!ziz78jXh$_06v321ONa4 diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 81f29db2ecf7ce874b56ce289faf1ecbdede9eac..a29a8e9f0931989cab9fc15a9dc5b6320cf722b3 100644 GIT binary patch delta 172 zcmZoYX8!P~`2;g&y*%NKmK`Q++Ihm^ybO~!T1idTH1D5VHd@2M}{^-%`p|dw;rMD7PqcNl|HgZYVbp^K8!zR?96dq+ delta 194 zcmaEO)V%eW`2;iOOsu-h;hM5Q zakb5U=AYQuOiT?8EDf98?AqPz7=f4xh?#+y1&CRD)DJJndUb*?^cGh&h0mbNiN3uG;&|h6=XR4MMr4*mM*O6l@iy3x;xwvZN*E6t{bZ kasx5XcF$1WmR^x=rIJ3Kk2|jgEkBgd$$Pj^?@V|S028f21ONa4 diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index d31da707a8f4c6f13e60cd22da149474acf841b4..7eac2ce3f9e27bfbdee05c77926c4234e08eb62a 100644 GIT binary patch delta 172 zcmbQa!~E-Z^9g3mhIzspEjvuuwDW|+c^M{ew33>vZz{R@mx(45YX)C9t1M7RZL^>G zCpI<H=GmSb$~&V?q-mDHvg6UUrHa{i OPyajQU&42NW*Pt+Ts<8C delta 194 zcmeym-F)T_^9g3mX@7Y(T6UPQCH&1r z;%b}y%s;WQnV1?HSei7u*|odbF#<6Y5HkZY3lOtzce7*rW5#S`tuWp3BeU~#gV`(! z)46Ndc-ps=vH>wW5OV-A=k_h7T($R^4Hays8-#L8vFRunDA+1Y7YyYVWl2lSDQ@=+ lvZz{R@mx(45YX)C9t1M7RZL^>G zCpI<1r z;%b}y%s;WQnV1?HSeiGx*|odbF#<6Y5HkZY3lOtzce7*rW5#S`tuWp3BeU~#gV`(! z)46Ndc-ps=vH>wW5OV-A=k_h7T($R^4Hays8-#L8vFRunDA+1Y7YyYVWl2lSDQ@=+ kxBvhE diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index 1799e044e85a30b825e92d5e3a8c441e0289d11f..eeab179b54d5380e37c3488bf47c489ba6d6e0e2 100644 GIT binary patch delta 172 zcmdnL-+cCd^9g3m7J0%OEjvuuwDW|+c^M{ew33>vZz{R@mx(45YX)C9t1M7RZL^>G zCpI<d|b~iglAZ7w$W*}w(V%F_$c5Hvlm`$t|raOLQcAjo9n?+$dcMTg) z`<7BRAZ7<*4j|^-zNM6__WpFiP;OD?lA_Y~+)!>H=GmSb%4^ppGVNr?l73UcIqA!9 ObqkzGYdBnY=p6t6PCX<5 delta 194 zcmbQe-+cdm^9g3mxqo>!T6UPQCH&1r z;%b}y%s;WQnV1?H8W=Xa*|odbF#<6Y5HkZY3lOtzce7*rW5#S`tuWp3BeU~#gV`(! z)46Ndc-ps=vH>wW5OV-A=k_h7T($R^4Hays8-#L8vFRunDA+1Y7YyYVWl2lSDQ@=+ kpbC&mK`Q++Ihm^ybO~!T1idTH1D5VHd@2M}{^-%`p|dw;rMD7PqcNl|HgZYVbp^K8!zOsu-h;hM5Q zakb5U=AYQuOiT?84NRKd?AqPz7=f4xh?#+y1&CRD)DJJndUb*?^cGh&h0mbNiN3uG;&|h6=XR4MMr4*mM*O6l@iy3x;xwvZN*E6t{bZ kasx5XcF#~=l`fH5u_~P=%hN1;E)5$lHRpG>%DW2!0K0cR_W%F@ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index 6c8d80143f39b7015238d56d60b2ce6ba4bb3920..e89dbfec613c2dc14f029cb2eb26bcf9cc9aa05d 100644 GIT binary patch delta 172 zcmZ3p-@IeL`2;g&`#j-|mK`Q++Ihm^ybO~!T1idTH1D5VHd@2M}{^-%`p|dw;rMD7PqcNl|HgZYVbp^K8!z<<;&IX{~uPr~jOO_TH1s OH(13K?PiqKW&;4~MmsD3 delta 194 zcmeC!Z@y-~`2;iOlD|9~Ejvuu68`dp^D<1{XeBjS-&At?J852y%}l0>Osu-h;hM5Q zakb5U=AYQuOiT?84J?}7?AqPz7=f4xh?#+y1&CRD)DJJndUb*?^cGh&h0mbNiN3uG;&|h6=XR4MMr4*mM*O6l@iy3x;xwvZN*E6t{bZ kasx5XcF#~=?Jkl3H-9F4t|*vZz{R@mx(45YX)C9t1M7RZL^>G zCpI<d|b~iglAZ7w$W*}w(V%F_$c5Hvlm`$t|raOLQcAjo9n?+$dcMTg) z`<7BRAZ7<*4j|^-zNM6__WpFiP;OD?lA_Y~+)!>H=GmSb%Dbma#JaU@Vq3g&x@KH6 NZ)+-Vv-RSjP5|w)Iurl^ delta 194 zcmbPvz1r z;%b}y%s;WQnV1>^L9?4(yPF*&5HkTWGZ3=?G3$0WJGMV&%tqD<(;YuDJ5M*5&7v@! zyM~RYeM>1D5VHd@2M}{^-%`p|d!N}*!FIYqD7O@wj)H-Lt-^G{P;OC{w8Wg^cF$05 jAm-Wb8Opn-OXN&Io9?l!Z-2eTB?ASHJUME-e~v2v4)sAs diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index 0c4027cf5a3f67e5e0d93231afcf609bb9c87099..95c893fdde26387a0060cd6056fa3aa2781ec454 100644 GIT binary patch delta 171 zcmbQc-~8u3^9g3mu6e>6EjvuuwDW|+c^M{ew33>vZz{R@mx(45YX)C9t1M7RZL^>G zCpK0Kb7LceW>>p*S35=^W&&bnAZ7t#*6pr#Y=6y|O{^8BJAPz#o^CLkMPWL34I5AU zmQpq#W(Q&pAm-e@rIf4o{&c}mZc*lvqSE%mcW delta 193 zcmeyl&wTEF^9g3m)qi<5T6UPQCH&1r z;%b}y%s;WQnwT0I8aBJywY%Ce0x=U1GXpUT5VLM~wPX8h#%yG*Fx~MZv-5O=*(?gv zxog;X+P9Rl0Wmuea{w{t_ARAcwfC6~6>O&)gmO!<=_nW|*eXmH4CNMONlVNrZubo3 j24bG=o}s)lT_P^?e&rtfC^h@yresrr467QyU!KVT2NXb) diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index 7b1aad6fd9806897c523a94b7439fedf2107b346..d70bb1fbf18e7eaa74fd916cd3c998b92c6b2a40 100644 GIT binary patch delta 172 zcmX?c$b88m^9g3mo_WF>EjvuuwDW|+c^M{ew33>vZz{R@mx(45YX)C9t1M7RZL^>G zCpI<H=GmSb%6q(9L^8em#e>Oeb%)wI OR~D4?`ka5*xdQ+u>^1r z;%b}y%s;WQnV1?H8d@~F*|odbF#<6Y5HkZY3lOtzce7*rW5#S`tuWp3BeU~#gV`(! z)46Ndc-ps=vH>wW5OV-A=k_h7T($R^4Hays8-#L8vFRunDA+1Y7YyYVWl2lSDQ@=+ l==QV35c12m<5Pgx4YS~{V`)Uu~wMw_>tLpy1{G~h3VWiY&`8- zO4)#z9f&!Am~;D1r z;%b}y%s;WQnV1?H8ksh`*|odbF#<6Y5HkZY3lOtzce7*rW5#S`tuWp3BeU~#gV`(! z)46Ndc-ps=vH>wW5OV-A=k_h7T($R^4Hays8-#L8vFRunDA+1Y7YyYVWl2lSDQ@=+ l$}_vO#RiW6o8)cAN`0{|AeL7M;o diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index d8f1364be65b2c295c8256db31b4ad9eeac7ba54..26e601c5f22f27a04d2a4a93020481b272be3222 100644 GIT binary patch delta 172 zcmdmgzvZz{R@mx(45YX)C9t1M7RZL^>G zCpI<H=GmSb%Db;iq<(Ednffi>m#JTO OoNU@Yb&1LZhYA28%{^rR delta 194 zcmbPzz1r z;%b}y%s;WQnV1?H8d)^E*|odbF#<6Y5HkZY3lOtzce7*rW5#S`tuWp3BeU~#gV`(! z)46Ndc-ps=vH>wW5OV-A=k_h7T($R^4Hays8-#L8vFRunDA+1Y7YyYVWl2lSDQ@=+ lvZz{R@mx(45YX)C9t1M7RZL^>G zCpI<d|b~iglAZ7w$W*}w(V%F_$c5Hvlm`$t|raOLQcAjo9n?+$dcMTg) z`<7BRAZ7<*4j|^-zNM6__WpFiP;OD?lA_Y~+)!>H=GmSb%6p_+WRr^SemBRP6;oxR O^;Pz*n3VFz;XD8oc03mV delta 194 zcmZ2@$o%Lb^9g3m-G6yDT6UPQCH&1r z;%b}y%s;WQnV1?H8XGpd*|odbF#<6Y5HkZY3lOtzce7*rW5#S`tuWp3BeU~#gV`(! z)46Ndc-ps=vH>wW5OV-A=k_h7T($R^4Hays8-#L8vFRunDA+1Y7YyYVWl2lSDQ@=+ kvZz{R@mx(45YX)C9t1M7RZL^>G zCpI<H=GmSb%6qI^gw;s*t=RS`PAj3V OlZx>ThFesB=mG!+AUYHP delta 194 zcmZ2{$o%*r^9g3meSdj2T6UPQCH&1r z;%b}y%s;WQnV1?H8k;n`*|odbF#<6Y5HkZY3lOtzce7*rW5#S`tuWp3BeU~#gV`(! z)46Ndc-ps=vH>wW5OV-A=k_h7T($R^4Hays8-#L8vFRunDA+1Y7YyYVWl2lSDQ@=+ kvZz{R@mx(45YX)C9t1M7RZL^>G zCpI<H=GmSb%6qa~q`f>{?Qz8e!5B{0 OQwyTk&%Exh77hR=%RBx6 delta 194 zcmZ2>$o$kH^9g3mlm7B-wCpfpOZdwZ&dV@)qm|TTeN)Nl@1%J-HZz$jGO_A1hil3L z#nm?ZnSWwqGch$ZG`47Vvuk&=V+3L*AZ7+)79eKb?qOk+dV^hPj-u}o*egXqGzD()wi}mx9+F8m&YFa2LML^LdgIC diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index 6544deb231a693b38411a192bec2cff288af7e1d..6d3cddf71abe444836a00231059fa647557ab166 100644 GIT binary patch delta 172 zcmdmfzvZz{R@mx(45YX)C9t1M7RZL^>G zCpI<H=GmSb%Db&gME#Ih`@YpnZ4Qde OWwpzmx%lYqnf3q+uRJ*b delta 194 zcmbPyzOk+dV^hw{?kJz4gFv@zf^O_4%ikad93w#bKqo7yu}~K|BBe diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 1bc4276021637699fccbc218fbae952d1f66f468..577dcba5498054bfb456b3f48c1c2e5f0470fe23 100644 GIT binary patch delta 172 zcmZ3w-@I|Z`2;iO)I8yhmK`Q++Ihm^ybO~!T1idTH1D5VHd@2M}{^-%`p|dw;rMD7PqcNl|HgZYVbp^K8!zfevAU<3f<-#YOC delta 194 zcmZqNZ@zTD`2;iO8Gm^;T6UPQCH&1r z;%b}y%s;WQnV1?HnwT`Z*|odbF#<6Y5HkZY3lOtzce7*rW5#S`tuWp3BeU~#gV`(! z)46Ndc-ps=vH>wW5OV-A=k_h7T($R^4Hays8-#L8vFRunDA+1Y7YyYVWl2lSDQ@=+ lvZz{R@mx(45YX)C9t1M7RZL^>G zCpI<H=GmSb$~&P;q>gdjqo8oDO=qP0 OO1&?C;aVH>qY(fvjy%Hv delta 194 zcmaF6-+bZ$^9g3mbN}*ewCpfpOZdwZ&dV@)qm|TTeN)Nl@1%J-HZz$jGO_A1hil3L z#nm?ZnSWwqGch$ZG_h=Uvuk&=V+3L*AZ7+)79eKb?qOk+dV^hCv=I-NxjjQ8YvZz{R@mx(45YX)C9t1M7RZL^>G zCpI<H=GmSb$}7_)!ZA5n+*qG+K6CwT N?Ja_iqW((J?f?~tI3@r9 delta 194 zcmeyl&wTEF^9g3mi~sU$wCpfpOZdwZ&dV@)qm|TTeN)Nl@1%J-HZz$jGO_A1hil3L z#nm?ZnSWwqGch$ZG&OB@vuk&=V+3L*AZ7+)79eKb?qOk+dV^hWx7OmT-vDjYFG67mLH4f^ww9cR5GuT2LNg7LH+;$ diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index 48ec50772e7aa5a20857e4966f544e7e6b38d928..b8d7d77e4d6963cf5f3556869ccb7b05a2e67164 100644 GIT binary patch delta 172 zcmX?c$b88m^9g3m#d*RTEjvuuwDW|+c^M{ew33>vZz{R@mx(45YX)C9t1M7RZL^>G zCpI<H=GmSb%6q(9Ok+dV^hk9Uh?WeeXpk$rC|)9)gc%eP;-e0=3|4**n&LxcbT diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index 979d20dc936bb152668e6a27be8824bde4915fa4..fdad5103d66a37015666a75b5155709125e32917 100644 GIT binary patch delta 172 zcmeyk-~8-;^9g3mWqHCIEjvuuwDW|+c^M{ew33>vZz{R@mx(45YX)C9t1M7RZL^>G zCpI<H=GmSb%3IJSVsAQOPPzf#6uWIX OVKt8V&yJ{Ao&o?-fjeaY delta 194 zcmX@R-~8i#^9g3mtN!wAwCpfpOZdwZ&dV@)qm|TTeN)Nl@1%J-HZz$jGO_A1hil3L z#nm?ZnSWwqGch$ZG&5>;vuk&=V+3L*AZ7+)79eKb?qOk+dV^h3%W$~LzaaUUwONV>D0n5XQsms_V-WO1ps@bLSX;^ diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index 5b8fab129beec60771d6a4c9d4079568e7a7cdbe..2a53380eefe205c577096f8ac31c3fc0e1dc0d9c 100644 GIT binary patch delta 172 zcmdmRz`W;x`2;iOoIK%;mK`Q++Ihm^ybO~!T1idTHyPF*&5HkTWGZ3=?G3$0WJGMV&%qG?f(;YuDJ5M*5&7v@!yM~RY zeM>1D5VHd@2M}{^-%`p|dw;rMD7PqcNl|HgZYVbp^K8!zq=l}o}(LIR( delta 194 zcmeA1r z;%b}y%s;WQnV1?Hni@5`*|odbF#<6Y5HkZY3lOtzce7*rW5#S`tuWp3BeU~#gV`(! z)46Ndc-ps=vH>wW5OV-A=k_h7T($R^4Hays8-#L8vFRunDA+1Y7YyYVWl2lSDQ@=+ k$^lGr(R%so75-2sG@sQZ{*(B3BepM02InWLjV8( diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index da1b404b..89d6c6d9 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=423; +build=424; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index da1b404b..89d6c6d9 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=423; +build=424; diff --git a/Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf b/Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf index cfcf4359..5eb1940e 100644 --- a/Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf +++ b/Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf @@ -28,7 +28,7 @@ _storedVehicleLimit = [_serverSettingsConfig, "storedVehicleLimit", 20] call EPO EPOCH_storedVehicleCount = 0; for "_i" from 0 to _maxTraderLimit do { - _traderSlotIndex = EPOCH_TraderSlots pushBack str(_i); + _traderSlotIndex = EPOCH_TraderSlots pushBack _i; // Spawn static traders first if (_staticTradersArrCount > 0 && _i < _staticTradersArrCount) then { diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index da1b404b..89d6c6d9 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=423; +build=424; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index da1b404b..89d6c6d9 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=423; +build=424; diff --git a/build.txt b/build.txt index db83efa6..f48d32be 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -423 +424