diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua b/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua index 5334e45f4..35526b3e3 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua @@ -60,6 +60,23 @@ resource_manifest_version '77731fab-63ca-442c-a67b-abc70f28dfa5' data_file 'VEHICLE_VARIATION_FILE' 'data/EG-Sheriff/carvariations.meta' data_file 'VEHICLE_LAYOUTS_FILE' 'data/EG-Sheriff/dlctext.meta' + -- 18charger + files { + 'data/18charger/vehicles.meta', + 'data/18charger/carvariations.meta', + 'data/18charger/carcols.meta', + 'data/18charger/handling.meta', + 'data/18charger/vehiclelayouts.meta', +} + +data_file 'HANDLING_FILE' 'data/18charger/handling.meta' +data_file 'VEHICLE_METADATA_FILE' 'data/18charger/vehicles.meta' +data_file 'CARCOLS_FILE' 'data/18charger/carcols.meta' +data_file 'VEHICLE_VARIATION_FILE' 'data/18charger/carvariations.meta' +data_file 'VEHICLE_LAYOUTS_FILE' 'data/18charger/dlctext.meta' + + + -- valor13rb files { 'data/valor13rb/vehicles.meta', diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/18charger/18charger_sign_1.jpg b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/18charger/18charger_sign_1.jpg new file mode 100644 index 000000000..e96def07e Binary files /dev/null and b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/18charger/18charger_sign_1.jpg differ diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/18charger/carcols.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/18charger/carcols.meta new file mode 100644 index 000000000..717f85682 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/18charger/carcols.meta @@ -0,0 +1,446 @@ + + + + + + + + + 18charger + + + + + + + VehicleLight_sirenlight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/18charger/carvariations.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/18charger/carvariations.meta new file mode 100644 index 000000000..3dfb5d6b2 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/18charger/carvariations.meta @@ -0,0 +1,62 @@ + + + + + 18charger + + + + 0 + 134 + 0 + 64 + 64 + 64 + 64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0_default_modkit + + + + + + Police guv plate + + + + + + + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/18charger/vehicles.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/18charger/vehicles.meta new file mode 100644 index 000000000..7c7aa43b6 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/18charger/vehicles.meta @@ -0,0 +1,140 @@ + + + vehshare + + + + 18charger + 18charger + BUFFALO2 + 18charger + + null + null + null + null + + null + lg81hcredeye + LAYOUT_STANDARD + SHERIFF_COVER_OFFSET_INFO + EXPLOSION_INFO_DEFAULT + + DEFAULT_FOLLOW_VEHICLE_CAMERA + DEFAULT_THIRD_PERSON_VEHICLE_AIM_CAMERA + VEHICLE_BONNET_CAMERA_MID_HIGH + DEFAULT_POV_CAMERA + + + + + + + + + + + + + + + + + + + + + + + + + + + + VFXVEHICLEINFO_CAR_GENERIC + + + + + + + + + + + + + + + + + + + + + + 500.000000 + 500.000000 + 500.000000 + 500.000000 + 500.000000 + 500.000000 + + + + + + + + + + + SWANKNESS_1 + + FLAG_HAS_LIVERY FLAG_EXTRAS_REQUIRE FLAG_EXTRAS_STRONG FLAG_LAW_ENFORCEMENT FLAG_EMERGENCY_SERVICE FLAG_NO_RESPRAY FLAG_DONT_SPAWN_IN_CARGEN FLAG_REPORT_CRIME_IF_STANDING_ON FLAG_HAS_INTERIOR_EXTRAS + VEHICLE_TYPE_CAR + VPT_FRONT_AND_BACK_PLATES + VDT_GENTAXI + VC_EMERGENCY + VWT_MUSCLE + + + + + S_M_Y_Sheriff_01 + + + + + + + + + + + REWARD_WEAPON_PUMPSHOTGUN + REWARD_AMMO_PUMPSHOTGUN_ENTER_VEHICLE + REWARD_STAT_WEAPON + + + WHEEL_FRONT_RIGHT_CAMERA + WHEEL_FRONT_LEFT_CAMERA + WHEEL_REAR_RIGHT_CAMERA + WHEEL_REAR_LEFT_CAMERA + + + + + + + STD_POLICE_FRONT_LEFT + STD_POLICE_FRONT_RIGHT + STD_POLICE_REAR_LEFT + STD_POLICE_REAR_RIGHT + + + + + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/03k9/03k9.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/03k9/03k9.ytd index 590300ddc..a741e26c8 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/03k9/03k9.ytd +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/03k9/03k9.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c1d14bc65864fab01d35195752c7f4cb35fc03a3da1b97cbd08d38c8d4f4974 -size 10702763 +oid sha256:4358e49c912e1969d0f0e4bcc7d4d66b2b8afdf5ee0a1ea27681436876cde93d +size 10642924 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18charger/18charger+hi.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18charger/18charger+hi.ytd new file mode 100644 index 000000000..852e7a7de --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18charger/18charger+hi.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43f9d01a730a1e6bb3a67be0f8e0cf2889917f0682667551053ad352d0500f6c +size 9219 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18charger/18charger.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18charger/18charger.yft new file mode 100644 index 000000000..419ff4ea0 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18charger/18charger.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:703114d852c0541611717eb656f7866161dbf5a3f917d44fc2f1a526e754e47d +size 1602169 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18charger/18charger.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18charger/18charger.ytd new file mode 100644 index 000000000..b01ff5969 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18charger/18charger.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:238f5b960a311eb0c1c82d4f9cc2547ac75d9bc260d336066decf132dff7b3e8 +size 5830594 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18charger/18charger_hi.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18charger/18charger_hi.yft new file mode 100644 index 000000000..1de8dd841 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18charger/18charger_hi.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc1b820ec23fa0b11b1ab86b4209e84279a416b84c0572816d92e7266f7a965a +size 3823127 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18gtruckrb/18gtruckrb.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18gtruckrb/18gtruckrb.ytd index c38e88391..2ec3c40f9 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18gtruckrb/18gtruckrb.ytd +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/18gtruckrb/18gtruckrb.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcc77e34074fa4aaa8bda621c4aaf3b02626bd8fd35cebfa241224633f5cb273 -size 8929417 +oid sha256:58c419f62a9bcd101a753be2bea649f3f7fc72c83a9739043530d04fbe9aaba9 +size 8818240 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/22expedition/22expedition.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/22expedition/22expedition.ytd index ab8c80ee6..80d4201d1 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/22expedition/22expedition.ytd +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/22expedition/22expedition.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af7dfd8d29df783c20d9eb5ad2a8d1328efe4a105243924f7ca1f43049b46185 -size 16367544 +oid sha256:064287fac651860eb49c387373ec09614491cdd1885e9bfe6f49f269c081ed52 +size 16497749 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/23gtruckrb/23gtruckrb.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/23gtruckrb/23gtruckrb.ytd index ed3a7f9de..180ca70a8 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/23gtruckrb/23gtruckrb.ytd +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/23gtruckrb/23gtruckrb.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:745a3a4b34ecbb92edb278dd5c1b235b6e391740738c1730e08234eaf17770ab -size 10029583 +oid sha256:7fc92a5acea270111df9e59bd683afe35c3118a89aa324fc3f32906c5edbf5bf +size 10092261 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/5seprb/5seprb.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/5seprb/5seprb.ytd index 226d4ddaf..d21de072b 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/5seprb/5seprb.ytd +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/5seprb/5seprb.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4978b174a45babeb2cf0e153d3b58f63d6d9c90cb5b58b2f5989870304e537ff -size 13501281 +oid sha256:bdb1c7a55109b68c4bf1cb15d0899f665a38ff1cdfdbe45bf13c9acfb1f02f1c +size 13258304 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/mbu2rb/mbu2rb.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/mbu2rb/mbu2rb.ytd index b864521c7..171e85659 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/mbu2rb/mbu2rb.ytd +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/mbu2rb/mbu2rb.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35be7cfef95259ee91fe71586c43863031483b6d7e170001242e953c3487ffd3 -size 4301630 +oid sha256:afe0cb31fb0384b5e9ab536cf509f30dbbba322ef7b412858344c29cf1a33657 +size 4305556 diff --git a/resources/enhancedcamera/LICENSE b/resources/enhancedcamera/LICENSE deleted file mode 100644 index 1a63fb565..000000000 --- a/resources/enhancedcamera/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 Luke Kabat - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/resources/enhancedcamera/MenuAPI.dll b/resources/enhancedcamera/MenuAPI.dll deleted file mode 100644 index 8a23b318b..000000000 Binary files a/resources/enhancedcamera/MenuAPI.dll and /dev/null differ diff --git a/resources/enhancedcamera/Newtonsoft.Json.dll b/resources/enhancedcamera/Newtonsoft.Json.dll deleted file mode 100644 index 6afafb8ee..000000000 Binary files a/resources/enhancedcamera/Newtonsoft.Json.dll and /dev/null differ diff --git a/resources/enhancedcamera/README.md b/resources/enhancedcamera/README.md deleted file mode 100644 index 5cd394917..000000000 --- a/resources/enhancedcamera/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Enhanced Camera - -## Overview of the menu -This menu recreates vehicle camera from scratch and introduces a number of customizable parameters for user to tune. On top of that there is a drone camera with a few modes to simulate drone flight. - -Main features of this menu: -- **Lead camera** - main camera, rotates around car dependant on angular velocity of the vehicle -- **Chase camera** - focuses on closest vehicle and points towards it -- **Drone camera** - simulates drone physics, allows choice between different modes (race, zero-G, spectator, homing) -- **Customizable parameters** - FOV, XYZ position offsets, interpolation values and more -- **Saving/loading** - save and load camera parameters or choose from default presets - -## Installation - -Go to [releases](https://github.com/Shrimpey/EnhancedCamera/releases) and download latest zipped release. Unzip and place ``enhancedcamera`` folder inside your server's ``resources`` folder, then edit your server.cfg to include line ``start enhancedcamera``. - -## Parameters overview - -It's best to just experiment with parameters to see how they affect camera handling (for lead/chase camera you can start by spawning a preset from submenu). -#### Lead and chase camera parameters: -- **Lock position offset** - determines whether camera changes position compared to vehicle (or just rotates) -- **Linear position offset** - experimental feature, camera changes position along the line drawn behind vehicle instead of doing circular motion around the car -- **Lock rotation to camera plane** - changes the way that camera rotates around car (mostly visible on uneven ground) -- **Modifier** - this modifier * angular velocity = target rotation. Higher values make camera move further from lock. (-1,1) -- **Yaw interpolation** - lower values - smoother movement along yaw axis (0,1) -- **Roll interpolation** - lower values - smoother movement along roll axis (0,1) -- **Pitch interpolation** - lower values - smoother movement along pitch axis (0,1) -- **Camera offset** - offsets chase camera target towards its velocity vector. (0,5) -- **Position interpolation** - lower values - smoother movement, higher delay. (0,1) -- **FOV** - changes field of view, may affect performance with higher values (20,120) -- **X/Y/Z Offset** - static position offset in XYZ direction -- **Max angle to lock** - for chase camera only, max angle from velocity vector to keep the lock on, if angle exceeds this limit, camera switches back to normal. (25,360) - -## Examples - -## Credits -- [Tom Grobbe](https://github.com/TomGrobbe) - [MenuAPI](https://github.com/TomGrobbe/MenuAPI) used for GUI, code snippets from [vMenu](https://github.com/TomGrobbe/vMenu) used for saving/loading camera parameters -- [QuadrupleTurbo](https://github.com/QuadrupleTurbo) - providing new ideas for features, massive help with playtesting -- [No Name Drift](https://nonamedrift.com/) and [Velocity](http://www.velocitydrift.com/) servers - playtesting and feedback diff --git a/resources/enhancedcamera/__resource.lua b/resources/enhancedcamera/__resource.lua deleted file mode 100644 index 417a60afe..000000000 --- a/resources/enhancedcamera/__resource.lua +++ /dev/null @@ -1,11 +0,0 @@ -resource_manifest_version '77731fab-63ca-442c-a67b-abc70f28dfa5' - -files { - 'MenuAPI.dll', - 'config.ini' -} - -client_script { - 'enhancedcamera.net.dll', - 'Newtonsoft.Json.dll' -} \ No newline at end of file diff --git a/resources/enhancedcamera/config.ini b/resources/enhancedcamera/config.ini deleted file mode 100644 index 8af1fc9ad..000000000 --- a/resources/enhancedcamera/config.ini +++ /dev/null @@ -1,6 +0,0 @@ -#The Control to toggle the Menu (default is 344=F11) list at https://wiki.fivem.net/wiki/Controls -toggleMenu=56 -#Should chase camera be enabled for users to select? (1 - yes, 0 - no) -chaseCameraEnabled=1 -#Should drone camera be enabled for users to select? (1 - yes, 0 - no) -droneCameraEnabled=1 \ No newline at end of file diff --git a/resources/enhancedcamera/enhancedcamera.net.dll b/resources/enhancedcamera/enhancedcamera.net.dll deleted file mode 100644 index 5d79847ad..000000000 Binary files a/resources/enhancedcamera/enhancedcamera.net.dll and /dev/null differ diff --git a/resources/lvc/SIRENS.lua b/resources/lvc/SIRENS.lua index 37b767b2e..e32c0a869 100644 --- a/resources/lvc/SIRENS.lua +++ b/resources/lvc/SIRENS.lua @@ -400,7 +400,12 @@ SIREN_ASSIGNMENTS = { ['lapd2'] = { 1, 2, 3, 4, 25, 26 }, ['lasd12'] = { 1, 2, 3, 4, 25, 26 }, ['LASDCVPI2'] = { 1, 2, 3, 4, 25, 26 }, + ['lasdchrg14'] = { 1, 2, 3, 4, 25, 26 }, ['lasd14chrg'] = { 1, 2, 3, 4, 25, 26 }, + ['18charger'] = { 1, 2, 3, 4, 25, 26 }, + ['lasd11'] = { 1, 2, 3, 4, 25, 26 }, + ['lasd13'] = { 1, 2, 3, 4, 25, 26 }, + ['lasd14'] = { 1, 2, 3, 4, 25, 26 }, ['22tahoe'] = { 27, 16, 17, 2, 3, 4, 29, 18, 42, 31 }, ['03k9'] = { 27, 16, 17, 2, 3, 4, 29, 18, 42, 31 }, ['GESUVRB'] = { 27, 16, 17, 2, 3, 4, 29, 18, 42, 31 }, @@ -485,7 +490,13 @@ SIREN_ASSIGNMENTS = { ['f150batt'] = { 45, 48, 13, 50, 47, 46 }, ['firerescuetrailer'] = { 45, 48, 13, 50, 47, 46 }, ['foam1'] = { 45, 48, 13, 50, 47, 46 }, - ['10charg'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, + ['10charg'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, + ['376'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, + ['640'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, + ['128'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, + ['704'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, + ['615'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, + ['751'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, ['10chargslick'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, ['11cvpi'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, ['11cvpislick'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, diff --git a/resources/taser_effect-main/config.lua b/resources/taser_effect-main/config.lua index 3167a95e4..53190c210 100644 --- a/resources/taser_effect-main/config.lua +++ b/resources/taser_effect-main/config.lua @@ -17,7 +17,7 @@ Config.TimecycleTransitionDuration = 5.0 -- How long the transition back to no t Config.CameraShake = true -- If we should shake the camera on beeing stunned Config.CameraShakeName = "FAMILY5_DRUG_TRIP_SHAKE" -Config.CameraShakeIntensity = 0.25 +Config.CameraShakeIntensity = 0.50 Config.DisableNPCWrithe = true -- Disabled writhe for NPC when getting stunned. This will also make it so npc's won't do go into writhe even after they are done beeing stunned. (This ONLY effects stunned peds) Config.NPCDropWeapon = true -- Makes NPC's drop their weapon when they get stunned diff --git a/resources/vMenu/config/addons.json b/resources/vMenu/config/addons.json index d0018ea34..dbaab8aae 100644 --- a/resources/vMenu/config/addons.json +++ b/resources/vMenu/config/addons.json @@ -684,7 +684,9 @@ "Jtrailer", "23lightpro", "23lightproslick", - "ccso1", + "ccso1", + "18charger", + "ccso4", "c314charger", "c318tahoe", "376", @@ -692,6 +694,7 @@ "128", "704", "615", + "751", "EG-Sheriff", "sasp18charger", "gt24non", @@ -825,7 +828,6 @@ " ", " ", " ", - " ", " ", ], "peds": [ diff --git a/resources/vMenu/config/permissions.cfg b/resources/vMenu/config/permissions.cfg index 12aa053f5..b8601be33 100644 --- a/resources/vMenu/config/permissions.cfg +++ b/resources/vMenu/config/permissions.cfg @@ -515,7 +515,7 @@ add_ace builtin.everyone "vMenu.MiscSettings.DeathNotifs" allow add_ace group.staff "vMenu.MiscSettings.NightVision" allow add_ace group.staff "vMenu.MiscSettings.ThermalVision" allow add_ace builtin.everyone "vMenu.MiscSettings.LocationBlips" allow -#add_ace builtin.everyone "vMenu.MiscSettings.OverheadNames" allow +add_ace builtin.everyone "vMenu.MiscSettings.OverheadNames" allow add_ace group.staff "vMenu.MiscSettings.PlayerBlips" allow add_ace builtin.everyone "vMenu.MiscSettings.TeleportLocations" allow add_ace group.admin "vMenu.MiscSettings.TeleportSaveLocation" allow # Only allowed for moderators by default diff --git a/server.cfg b/server.cfg index 244f19ad5..e0bd3ff83 100644 --- a/server.cfg +++ b/server.cfg @@ -368,7 +368,7 @@ ensure e350vanb ensure ccso4 ensure tiller ensure e450ambo -ensure tillertrailer +ensure 751 ensure ensure ensure