Skip to content

Commit

Permalink
Merge pull request #649 from EpochModTeam/experimental
Browse files Browse the repository at this point in the history
Release 0.4 b639
  • Loading branch information
vbawol committed Nov 3, 2016
2 parents 5c5a33e + 2a9179e commit a4bf292
Show file tree
Hide file tree
Showing 318 changed files with 71,557 additions and 17,027 deletions.
31 changes: 16 additions & 15 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,26 @@ Open source survival gamemode for Arma 3.
Epoch Server DB extension (DLL / so)

### [Epoch Mod](https://github.com/EpochModTeam/EpochCore)
Epoch Assets Mod - Custom Units, Vehicles, Weapons, Items and more!

#### Credits

* [Aaron Clark ([VB]AWOL)](http://epochmod.com): Code, Configs, Textures
* [Kenneth Bente (Axle)](www.twitch.tv/axles): Tester, Models
* [Paul Tomany (Sequisha)](https://www.twitch.tv/sequisha): Models, Textures
* [Andrew Gregory (Axeman)](http://thefreezer.co.uk): AI Code
* [Raimonds Virtoss (Raymix)](https://www.twitch.tv/raymich): UI Code
* [Florian Kinder (Fank)](https://github.com/Fank): Code
* [Denis Erygin (devd)](https://github.com/denisio): Linux Code Support
* [Darren Harrison (Kiory)](https://www.twitch.tv/kiory123): Models, Textures, Configs
* [Paden Sturtevant (SteamPunkGears)](https://www.twitch.tv/steampunkgears): Models, Textures
* [Niklas Wagner (Skaronator)](https://skaronator.com): Code
* Damian Clark ([VB]GREEN): Graphics
Epoch Assets Mod Configs - Custom Units, Vehicles, Weapons, Items and more!

#### Developers
* [Aaron Clark ([VB]AWOL)](http://epochmod.com): Concept, Code, Configs, Textures - [x] Active
* [Kenneth Bente (Axle)](www.twitch.tv/axles): Tester, Models - [ ] Active
* [Paul Tomany (Sequisha)](https://www.twitch.tv/sequisha): Models, Textures - [ ] Active
* [Andrew Gregory (Axeman)](http://thefreezer.co.uk): AI Code - [x] Active
* [Raimonds Virtoss (Raymix)](https://www.twitch.tv/raymich): UI Code - [x] Active
* [Florian Kinder (Fank)](https://github.com/Fank): Code - [ ] Active
* [Denis Erygin (devd)](https://github.com/denisio): Linux Code Support - [ ] Active
* [Darren Harrison (Kiory)](https://www.twitch.tv/kiory123): Models, Textures, Configs - [ ] Active
* [Paden Sturtevant (SteamPunkGears)](https://www.twitch.tv/steampunkgears): Models, Textures - [ ] Active
* [Niklas Wagner (Skaronator)](https://skaronator.com): Code - [ ] Active
* [Damian Clark ([VB]GREEN)](http://epochmod.com): Graphics - [ ] Active

#### Contributors

* [Dan (OrangeSherbet)](https://www.twitch.tv/OrangeSherbet): Tester, Videos, Wiki Editor
* [HeMan](https://github.com/Ignatz-HeMan)
* [Robio](https://github.com/RC-Robio)
* [Poulmba](https://www.youtube.com/user/poulmba): Wiki Editor, Tester
* Richie: Map Support, Forum Moderator
* [Tobias Solem](http://whatthepoch.com/): Tester
Expand Down
28 changes: 28 additions & 0 deletions Changelogs/0.4.0.0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[New] Dynamic and extensible inventory sub menu system for item interaction and crafting options. (Double click item in your inventory)
[Added] Vehicle immunity when a vehicle is left locked inside a player owned base (within jammer range) at server startup. Thanks to @morgoth0 for the feedback!
[Added] Stamina loss when a player jumps.
[Added] Option to pour our gas to get an empty Jerry can and a "Drink" option to poison yourself.
[Added] Option to pour out honey and get an empty jar instead of eating it.
[Changed] Inventory Armor stats feature now dynamic and no longer forced via config.
[Changed] Group menu and group requests options are now found options on the self-action menu. (SPACE BAR)
[Changed] Wardrobe mirror now works in single player.
[Changed] Jetski and Electric Motorcycle motorcycle in-vehicle HUD now functions in singleplayer or editor.
[Changed] Updated Tanoa trade city layout and added ATM's. Thanks to @morgoth0 (aka Grahame on EpochMod.com Forum)
[Changed] Players now start with only 30% Hunger and Thirst instead of 100%.
[Fixed] Increased mass of "Hotwire Kit" (ItemHotwire) magazine item from 2 to 50 to address balance issues. Thanks to PR from @Ignatz-HeMan
[Fixed] Disposal of Snakes and other animals when inside a protection zone.
[Fixed] Shark bite attack and effect can now target all players.
[Fixed] Female ghillie suit transparency issue since Arma update 1.62.
[Fixed] Fireplace position incorrectly shifted down after lighting the fireplace. Thanks for the report by @Ignatz-HeMan #592
[Fixed] Increased anti-teleport range that should hopefully allow for proper HALO spawning.
[Fixed] Typos in Battleye script.txt that caused the filter not to function properly.
[Fixed] Trailing commas in mission addons array. Thanks to a RP from @SPKcoding (aka $p4rky on EpochMod.com Forum)
[Fixed] No longer possible to unlock Doors / Gates while using a UAV. Thanks to PR from @Ignatz-HeMan

Server Side Only:
[New] EpochServer.dll/so is now statically linked to pcre3 and hredis. On Windows this means that the pcre3.dll file in the arma 3 root can now be removed. On Linux we no longer depend on libhredis and libpcre to be installed.
[Added] Example mission file epoch_RyanZed.Tanoa that includes "RyanZombies" in the required addons array.
[Fixed] Database logging now trims log entries via the LogLimit setting provided in EpochServer.ini. The default is 1000 log records per list.

Known Issues:
Jetski and Electric Motorcycle motorcycle in-vehicle HUD will not initialize if player is spawned inside vehicle, as display getin EH did not fire.
Binary file modified Server_Install_Pack/@epochhive/EpochServer.dll
Binary file not shown.
1 change: 1 addition & 0 deletions Server_Install_Pack/@epochhive/EpochServer.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
BattlEyePath = C:\BattlEye
InstanceID = NA123
LogAbuse = 1
LogLimit = 999
IP = 127.0.0.1
Port = 2306
Password = changeme
Expand Down
Binary file modified Server_Install_Pack/@epochhive/addons/epoch_server.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo
Binary file not shown.
2 changes: 1 addition & 1 deletion Server_Install_Pack/@epochhive/epochah.hpp

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions Server_Install_Pack/@epochhive/epochconfig.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ cloneCost = 100; // debt incurred on player death
// vehicles - Max vehicle slots is calculated from per vehicle limits below. Warning! Higher the number lower the performance.
simulationHandlerOld = false; // When enabled this feature disables simulation on vehicles that are not nea players. Can help improve client fps at the cost of server fps.
vehicleLockTime = 1800; // Controls how many seconds it takes to allow another person/group to unlock vehicle.
removevehweapons[] = { // remove these Weapons from spawned Vehicles
"missiles_DAR","gatling_30mm","gatling_20mm","missiles_DAGR","cannon_30mm_Plane_CAS_02_F","Missile_AA_03_Plane_CAS_02_F","Missile_AGM_01_Plane_CAS_02_F","Rocket_03_HE_Plane_CAS_02_F",
"Rocket_03_AP_Plane_CAS_02_F","Bomb_03_Plane_CAS_02_F","Bomb_04_Plane_CAS_01_F","Rocket_04_AP_Plane_CAS_01_F","Rocket_04_HE_Plane_CAS_01_F","Missile_AGM_02_Plane_CAS_01_F","Missile_AA_04_Plane_CAS_01_F",
"Gatling_30mm_Plane_CAS_01_F","GBU12BombLauncher_Plane_Fighter_03_F","missiles_ASRAAM","missiles_SCALPEL","Twin_Cannon_20mm","missiles_Zephyr","rockets_skyfire","gatling_30mm_vtol_02"
};
removevehmagazinesturret[] = { // Remove these Magazines from the given Turret from spawned Vehicles
{"24Rnd_missiles",{-1}},
{"200Rnd_40mm_G_belt",{0}}
};

// Traders
taxRate = 0.1; // controls the price increase for purchases
Expand Down
Binary file modified Server_Install_Pack/@epochhive/epochserver.so
Binary file not shown.
1 change: 0 additions & 1 deletion Server_Install_Pack/@epochhive/libhiredis.so

This file was deleted.

Binary file removed Server_Install_Pack/@epochhive/libhiredis.so.0.10
Binary file not shown.
1 change: 0 additions & 1 deletion Server_Install_Pack/@epochhive/libpcre.so

This file was deleted.

Binary file removed Server_Install_Pack/@epochhive/libpcre.so.3
Binary file not shown.
16 changes: 7 additions & 9 deletions Server_Install_Pack/INSTALL.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
A3 EPOCH Server Install Guide

Prerequisites:
Prerequisites (Windows):

Visual C++ Redistributable Packages for Visual Studio 2013:
http://www.microsoft.com/en-us/download/details.aspx?id=40784

== INSTALL ==

1. Remove any previous @Epoch folders and Install A3 Epoch client files (@Epoch) into Arma3 root directory.
2. Copy the pcre3.dll and @EpochHive folder into your Arma3 root directory.
3. Open "DB" folder and start redis-server.exe with the parameter "redis.conf" or use start-redis.cmd. (Only one redis instance is needed per box, All servers connecting to the same redis will share character data by default.)
4. Open @EpochHive folder and edit EpochServer.ini BattlEyePath to match your server path to Battleye.
5. If running multiple servers on the same box, open "@EpochHive" folder and edit the "EpochServer.ini" setting "InstanceID" to a unique string for each A3 Epoch server.
6. Open "SC" folder and rename server-example.cfg to server.cfg edit the server.cfg server name, password, etc.
7. Open the SC/Battleye folder and rename example-BEServer.cfg to BEServer.cfg and change the RConPassword.
2. Open "DB" folder and start redis-server.exe with the parameter "redis.conf" or use start-redis.cmd. (Only one redis instance is needed per box, All servers connecting to the same redis will share character data by default.)
3. Open @EpochHive folder and edit EpochServer.ini BattlEyePath to match your server path to Battleye.
4. If running multiple servers on the same box, open "@EpochHive" folder and edit the "EpochServer.ini" setting "InstanceID" to a unique string for each A3 Epoch server.
5. Open "SC" folder and rename server-example.cfg to server.cfg edit the server.cfg server name, password, etc.
6. Open the SC/Battleye folder and rename example-BEServer.cfg to BEServer.cfg and change the RConPassword.
7. Look at the "start-A3-cmd-line-example.txt" file for an example command line for starting your server.

== NOTES ==

* As of 0.2.5.2 Server Hotfix Build A you only need BEC (http://ibattle.org/) with watchdog plugin (included in BEC folder) if you use do not use a PVS prefix.
* You should use a service restarter (like firedaemon) to keep the redis server and Arma 3 server running.
* A3 Server should be restarted every 4 hours. A good option ssing BEC http://ibattle.org/ scheduler and the #shutdown rcon command works well. (Scheduler Example: https://gist.github.com/vbawol/38b2f57d89c2c36106b3)
* The log rotator found in tools should only need one path to Arma 3 changed and should be ran just before the Arma 3 server starts. (firedeamon Pre/post service: Before Event)
* It is recommended that you use ASM https://github.com/fred41/ASM to monitor your server performance.
* Go to http://epochmod.com/forum/ for more help if needed.
* Go to http://epochmod.com/forum/ for more help if needed. GLHF!
Binary file removed Server_Install_Pack/keys/epoch0390.bikey
Binary file not shown.
Binary file added Server_Install_Pack/keys/epoch0400.bikey
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Altis.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Australia.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Bornholm.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Chernarus.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Desert_E.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Esseker.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Napf.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Porto.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Sara.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.SaraLite.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Stratis.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Takistan.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Tanoa.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.VR.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.Zargabad.pbo
Binary file not shown.
Binary file modified Server_Install_Pack/mpmissions/epoch.utes.pbo
Binary file not shown.
Binary file not shown.
Binary file removed Server_Install_Pack/pcre3.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion Server_Install_Pack/sc/BattlEye/addweaponcargo.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5 "" !="(V|H)_(F|)[0-9]{1,3}_EPOCH" !="Item(Map|GPS|Compass|Watch)" !="EpochRadio[0-9]" !="(U|G|bipod|acc|muzzle|optic)_[0-9A-Z_]{1,100}" !="(NVG|Defib|Heal|Repair|Elcan(_reflex|))_EPOCH" !="(Binocular|Rangefinder|Hatchet|CrudeHatchet|WoodClub|Melee(Sledge|Maul|Rod|Sword)|ChainSaw|MultiGun|Rollins_F|Plunger)" !="(ruger_pistol|speargun|1911_pistol|akm|m14|M14Grn|m16|m16Red|m107|m107Tan|m249|m249Tan|m4a3|sr25|l85a2|l85a2_(pink|ugl))_epoch" !="SMG_(01|02)_F" !="hgun_(PDW2000|ACPC2|Rook40|P07|Pistol_heavy_0[1-2]|Pistol_Signal)_F" !="LMG_(Mk200|Zafir)_F" !="srifle_(EBR|GM6|LRR|DMR_01)_(camo_|)F" !="arifle_(Katiba|Katiba_C|Katiba_GL|SDAR|TRG21|TRG20|TRG21_GL|Mk20|Mk20C|Mk20C_plain|Mk20_GL|Mk20_plain|Mk20_GL_plain)_F" !="arifle_(MXC|MX|MX_GL|MXM|MXM_Black|MX_GL_Black|MX_Black|MXC_Black|MX_SW|MX_SW_Black)_F" !="srifle_DMR_0[2-6](_(camo|sniper|khaki|tan|multicam|woodland|spotter|blk|hex|olive)_|_)F" !="MMG_0[1-2]_(hex|tan|camo|black|sand)_F" !"CUP_((h|s)gun|(s|a)rifle|(l|s)mg)_"
5 "" !="(V|H)_(F|)[0-9]{1,3}_EPOCH" !="Item(Map|GPS|Compass|Watch)" !="EpochRadio[0-9]" !="B_UavTerminal" !="(U|G|bipod|acc|muzzle|optic)_[0-9A-Z_]{1,100}" !="(NVG|Defib|Heal|Repair|Elcan(_reflex|))_EPOCH" !="(Binocular|Rangefinder|Hatchet|CrudeHatchet|WoodClub|Melee(Sledge|Maul|Rod|Sword)|ChainSaw|MultiGun|Rollins_F|Plunger)" !="(ruger_pistol|speargun|1911_pistol|akm|m14|M14Grn|m16|m16Red|m107|m107Tan|m249|m249Tan|m4a3|sr25|l85a2|l85a2_(pink|ugl))_epoch" !="SMG_(01|02)_F" !="hgun_(PDW2000|ACPC2|Rook40|P07|Pistol_heavy_0[1-2]|Pistol_Signal)_F" !="LMG_(Mk200|Zafir)_F" !="srifle_(EBR|GM6|LRR|DMR_01)_(camo_|)F" !="arifle_(Katiba|Katiba_C|Katiba_GL|SDAR|TRG21|TRG20|TRG21_GL|Mk20|Mk20C|Mk20C_plain|Mk20_GL|Mk20_plain|Mk20_GL_plain)_F" !="arifle_(MXC|MX|MX_GL|MXM|MXM_Black|MX_GL_Black|MX_Black|MXC_Black|MX_SW|MX_SW_Black)_F" !="srifle_DMR_0[2-6](_(camo|sniper|khaki|tan|multicam|woodland|spotter|blk|hex|olive)_|_)F" !="MMG_0[1-2]_(hex|tan|camo|black|sand)_F" !"CUP_((h|s)gun|(s|a)rifle|(l|s)mg)_"
2 changes: 1 addition & 1 deletion Server_Install_Pack/sc/BattlEye/attachto.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5 "" !WeaponHolderSimulated !Shot !"(Safe|LockBox|FirePlace|PlotPole|Jack|SolarGen)_EPOCH" !"Jack_SIM_EPOCH" !"LockBox_Ghost_EPOCH" !"CinderWallHalf_Ghost_EPOCH" !"(Tipi|Workbench|StorageShelf|Wood(Floor|LargeWall|Stairs|Ramp|Ladder|Tower)_Ghost_EPOCH" !"(Hesco3|Metal|Foundation)_Ghost_EPOCH" !"Land_Cages_F" !"Epoch_Sapper_F"
5 "" !WeaponHolderSimulated !Shot !"(Safe|LockBox|FirePlace|PlotPole|Jack|SolarGen)_EPOCH" !"Jack_SIM_EPOCH" !"LockBox_Ghost_EPOCH" !"CinderWallHalf_Ghost_EPOCH" !"(Tipi|Workbench|StorageShelf|Wood(Floor|LargeWall|Stairs|Ramp|Ladder|Tower)_Ghost_EPOCH" !"(Hesco3|Metal|Foundation)_Ghost_EPOCH" !"Land_Cages_F" !"Epoch_Sapper_F" !"[A-Z]_(G_)?(Offroad|Quadbike|Hatchback|SUV|Rubberboat|Van|Boat_Civil|SDV|MRAP|Truck)_([0-9]+_)?((box|transport|covered|mover|police|rescue|armed)_)?EPOCH" !"([A-Z]_)?[A-Z]+_(Boat|Scooter|Offroad|LSV)_((Transport)_)?[0-9]+_((unarmed|light)_)?F" !"K0(1|2|3|4)"
Loading

0 comments on commit a4bf292

Please sign in to comment.