diff --git a/fxmanifest.lua b/fxmanifest.lua index 9ef042a3e..894143163 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -5,7 +5,7 @@ author 'Tabarra' description 'Remotely Manage & Monitor your GTA5 FiveM Server' repository 'https://github.com/tabarra/txAdmin' -version '5.3.0-dev' +version '6.0.0-dev' ui_label 'txAdmin' rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.' diff --git a/nui/src/MenuWrapper.tsx b/nui/src/MenuWrapper.tsx index 2cabbc7b2..6a171c945 100644 --- a/nui/src/MenuWrapper.tsx +++ b/nui/src/MenuWrapper.tsx @@ -36,6 +36,7 @@ debugData( }, { action: "setGameName", + // data: 'fivem', data: 'redm', }, ], diff --git a/nui/src/components/MainPage/MainPageList.tsx b/nui/src/components/MainPage/MainPageList.tsx index ee4727e0d..2233e666c 100644 --- a/nui/src/components/MainPage/MainPageList.tsx +++ b/nui/src/components/MainPage/MainPageList.tsx @@ -323,6 +323,7 @@ export const MainPageList: React.FC = () => { title: t("nui_menu.page_main.clear_area.title"), description: t("nui_menu.page_main.clear_area.dialog_desc"), placeholder: "300", + suggestions: ['50', '150', '300'], onSubmit: (msg) => { const parsedRadius = parseInt(msg); diff --git a/nui/src/hooks/usePlayerListListener.ts b/nui/src/hooks/usePlayerListListener.ts index 0be173905..508779e32 100644 --- a/nui/src/hooks/usePlayerListListener.ts +++ b/nui/src/hooks/usePlayerListListener.ts @@ -34,7 +34,7 @@ export interface PlayerData { dist: number; /** * A non-normalized player health value - * Can be only be 0-200 + * Integer between 0-100 or -1 if information is not available **/ health: number; /** diff --git a/resource/menu/client/cl_spectate.lua b/resource/menu/client/cl_spectate.lua index e40aa6f16..675ddc6d3 100644 --- a/resource/menu/client/cl_spectate.lua +++ b/resource/menu/client/cl_spectate.lua @@ -356,17 +356,3 @@ RegisterNetEvent('txcl:spectate:start', function(targetServerId, targetCoords) DoScreenFadeIn(500) while IsScreenFadedOut() do Wait(5) end end) - - --- DEBUG Commands --- RegisterCommand('spec0', function() --- isSpectateEnabled = false --- end) --- RegisterCommand('spec1', function() --- isSpectateEnabled = true --- createInstructionalThreads() --- end) --- RegisterCommand('spec2', function() --- print('isSpectateEnabled', isSpectateEnabled) --- print('isInTransitionState', isInTransitionState) --- end)