diff --git a/BattlEye/scripts.txt b/BattlEye/scripts.txt index 66cff4c..e4f9655 100644 --- a/BattlEye/scripts.txt +++ b/BattlEye/scripts.txt @@ -1 +1,7 @@ -7 eventHandler !="ExAd_ACTION_PARACHUTE_DETACH = (findDisplay 46) displayAddEventHandler ["KeyDown",{" \ No newline at end of file +eventHandler !="ExAd_ACTION_PARACHUTE_DETACH = (findDisplay 46) displayAddEventHandler ["KeyDown",{" +compile !="call compile format[\"_messageParameters call ExAd_fnc_%1;\",_messageName]" +createVehicle !="_parachuteObject = createVehicle [\"Steerable_Parachute_F\", getPosATL player, [], 0, \"CAN_COLLIDE\"]" +addAction !="ExAd_ACTION_PARACHUTE = player addaction [format" +Entities !="waitUntil {sleep 0.1; {player distance _x < 10 max (sizeOf typeOf _x)} count (player nearEntities [\"Helicopter_Base_F\", 20]) == 0}" +disableCollisionWith !="_parachuteObject disableCollisionWith player" +remoteexec !="_this remoteExec [\"ExAdServer_fnc_clientRequest\",2]" \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..23019b6 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,13 @@ +#ExAd + +## Changelog: +### 160426 14:04 . v0.5.14 +#### Fixed +* BattlEye filters been updated +* VG App return to sideApp on unLoad +* VG App clear lists before onLoad and content being loaded. +* AdvHint trying to show EXO Logo +#### Added +* ExAd Logo.png +#### Deleted +* EXO Logo.png \ No newline at end of file diff --git a/mpmissions/Exile.Altis/ExAdClient/Core/Img/logo.paa b/mpmissions/Exile.Altis/ExAdClient/Core/Img/logo.paa new file mode 100644 index 0000000..779971f Binary files /dev/null and b/mpmissions/Exile.Altis/ExAdClient/Core/Img/logo.paa differ diff --git a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/CfgHints.cpp b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/CfgHints.cpp index 49dc98f..148bf97 100644 --- a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/CfgHints.cpp +++ b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/CfgHints.cpp @@ -21,7 +21,7 @@ class VGStore displayName = "Vehicle stored"; /*displayNameShort = "Your vehicle has been stored and is available through the Virtual Garage interface";*/ description = "Your vehicle has been stored and is only available through the territory it has been stored at. "; - image = "ExAdClient\Icons\logo.paa"; + image = "ExAdClient\Core\Img\logo.paa"; noImage = false; tip = ""; arguments[] = {}; @@ -30,7 +30,7 @@ class VGLoad { displayName = "Vehicle loaded to world"; description = "%1Your vehicle has been loaded to the world, the pin code is %11"; - image = "EXOClient\Icons\logo.paa"; + image = "ExAdClient\Core\Img\logo.paa"; noImage = false; tip = ""; arguments[] = {"VGLoad select 0"}; diff --git a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_fillVGList.sqf b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_fillVGList.sqf index 9587505..68acc45 100644 --- a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_fillVGList.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_fillVGList.sqf @@ -20,6 +20,8 @@ private ["_list","_idc","_vehClass","_data","_name","_index","_pic"]; _list = _this select 0; _idc = _this select 1; +lbClear _idc; + { _vehClass = if(typeName _x isEqualTo "ARRAY")then{_x select 1}else{typeOf _x}; _data = if(typeName _x isEqualTo "ARRAY")then{format["%1",_x select 0]}else{netId _x}; diff --git a/mpmissions/Exile.Altis/XM8_apps/apps/XM8_VG/Icons/apps_icon.paa b/mpmissions/Exile.Altis/XM8_apps/apps/XM8_VG/Icons/apps_icon.paa index cf7874c..779971f 100644 Binary files a/mpmissions/Exile.Altis/XM8_apps/apps/XM8_VG/Icons/apps_icon.paa and b/mpmissions/Exile.Altis/XM8_apps/apps/XM8_VG/Icons/apps_icon.paa differ diff --git a/mpmissions/Exile.Altis/XM8_apps/apps/XM8_VG/scripts/XM8_VG_mainVGSlide_onLoad.sqf b/mpmissions/Exile.Altis/XM8_apps/apps/XM8_VG/scripts/XM8_VG_mainVGSlide_onLoad.sqf index 51b9132..39c097c 100644 --- a/mpmissions/Exile.Altis/XM8_apps/apps/XM8_VG/scripts/XM8_VG_mainVGSlide_onLoad.sqf +++ b/mpmissions/Exile.Altis/XM8_apps/apps/XM8_VG/scripts/XM8_VG_mainVGSlide_onLoad.sqf @@ -110,6 +110,9 @@ _slides = _display displayCtrl 4007; if (isNull _slides) exitWith {_error = "Error loading XM8 VG app, slides control is null"; systemChat _error; diag_log _error;}; _unloadScript = ' + if (ExileClientXM8CurrentSlide == "mainVGSlide") then { + ExileClientXM8CurrentSlide = "sideApps"; + }; ExAd_Cur_Flag_NetId = nil; '; _display displayAddEventHandler ["unload",_unloadScript];