Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.3.9 b565 #577

Merged
merged 3 commits into from Jul 9, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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.
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.
Expand Up @@ -26,7 +26,7 @@ private ["_playerDeathScreen","_playerKilledScreen","_tapDiag","_config","_doRev
params [["_unit",objNull,[objNull]], ["_killer",objNull,[objNull]]];

_config = 'CfgEpochClient' call EPOCH_returnConfig;
_playerDeathScreen = getText(_config >> "playerDeathScreen")
_playerDeathScreen = getText(_config >> "playerDeathScreen");
if (_playerDeathScreen isEqualTo "") then {_playerDeathScreen = "TapOut"};
_tapDiag = _playerDeathScreen;
_doRevenge = (getNumber(_config >> "playerDisableRevenge") isEqualTo 0);
Expand All @@ -44,7 +44,7 @@ EPOCH_snapDirection = 0;
EPOCH_Target = objNull;

// playerKilledScreen
_playerKilledScreen = getText(_config >> "playerKilledScreen")
_playerKilledScreen = getText(_config >> "playerKilledScreen");
if (_playerKilledScreen isEqualTo "") then {_playerKilledScreen = "TapOut2"};
if(_doRevenge && player != _killer && (isPlayer _killer || isPlayer (effectiveCommander _killer)))then{_tapDiag = _playerKilledScreen};//TODO: vehicle check may not always be reliable

Expand Down
2 changes: 1 addition & 1 deletion Sources/epoch_config/build.hpp
@@ -1 +1 @@
build=564;
build=565;
2 changes: 1 addition & 1 deletion Sources/epoch_server/build.hpp
@@ -1 +1 @@
build=564;
build=565;
2 changes: 1 addition & 1 deletion Sources/epoch_server_core/build.hpp
@@ -1 +1 @@
build=564;
build=565;
2 changes: 1 addition & 1 deletion Sources/epoch_server_settings/build.hpp
@@ -1 +1 @@
build=564;
build=565;
2 changes: 1 addition & 1 deletion build.txt
@@ -1 +1 @@
564
565