mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-17 05:56:02 +01:00
Compare commits
4 Commits
732b07c957
...
v2.1.08
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7e320bcb99 | ||
|
|
54f96f7e77 | ||
|
|
dffed24fb3 | ||
|
|
aae2bd5021 |
22
.gitattributes
vendored
22
.gitattributes
vendored
@@ -1,12 +1,16 @@
|
||||
# VCS / CI noise
|
||||
.gitattributes export-ignore
|
||||
.gitignore export-ignore
|
||||
.github/** export-ignore
|
||||
.gitmodules export-ignore
|
||||
/.gitattributes export-ignore
|
||||
/.gitignore export-ignore
|
||||
/.gitmodules export-ignore
|
||||
/.github export-ignore
|
||||
|
||||
# Dev tooling/config
|
||||
.vscode/** export-ignore
|
||||
*.code-workspace export-ignore
|
||||
.editorconfig export-ignore
|
||||
.eslintrc* export-ignore
|
||||
.prettier* export-ignore
|
||||
/.vscode export-ignore
|
||||
*.code-workspace export-ignore
|
||||
/.editorconfig export-ignore
|
||||
/.eslintrc* export-ignore
|
||||
/.prettier* export-ignore
|
||||
|
||||
# Omit release-only helpers
|
||||
/server/restaurantchecker.lua export-ignore
|
||||
/server/installitems.lua export-ignore
|
||||
@@ -1,6 +1,6 @@
|
||||
name "Jim_Bridge"
|
||||
author "Jimathy"
|
||||
version "2.1.07"
|
||||
version "2.1.08"
|
||||
description "Framework Bridge By Jimathy"
|
||||
fx_version "cerulean"
|
||||
rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
|
||||
|
||||
@@ -638,6 +638,8 @@ function lookEnt(entity)
|
||||
debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..formatCoord(entity).."^7'")
|
||||
Wait(1500)
|
||||
end
|
||||
-- Make players head face the coord for 5 seconds
|
||||
TaskLookAtCoord(ped, entity.x, entity.y, entity.z, 5000, 1, 1)
|
||||
else
|
||||
if DoesEntityExist(entity) then
|
||||
local entCoords = GetEntityCoords(entity)
|
||||
@@ -646,6 +648,9 @@ function lookEnt(entity)
|
||||
debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..entity.."^7' - '"..formatCoord(entCoords).."^7'")
|
||||
Wait(1500)
|
||||
end
|
||||
|
||||
-- Make players head face the coord for 5 seconds
|
||||
TaskLookAtEntity(ped, entity, 5000, 1, 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -263,4 +263,14 @@ function fundSociety(society, amount)
|
||||
end
|
||||
|
||||
print("^1Error^7: ^3FundSociety^7: ^2No supported banking script found")
|
||||
end
|
||||
|
||||
if isServer() then
|
||||
createCallback(getScript()..":server:getAccount", function(source, society)
|
||||
if society then
|
||||
local getMoney = getSocietyAccount(society)
|
||||
return getMoney
|
||||
end
|
||||
return 0
|
||||
end)
|
||||
end
|
||||
@@ -77,6 +77,7 @@ end
|
||||
-- [[ Server.Cfg Convar Check ]]--
|
||||
-- Check server convars for hard set defaults, otherwise it uses per script configurations
|
||||
if Config and Config.System then
|
||||
debugMode = Config.System.Debug
|
||||
if Config.System.Debug then
|
||||
if GetConvar("jim_DisableDebug", "false") == "true" then
|
||||
debugMode = false
|
||||
@@ -84,10 +85,7 @@ if Config and Config.System then
|
||||
if GetConvar("jim_DisableEventDebug", "false") == "true" then
|
||||
Config.System.EventDebug = false
|
||||
end
|
||||
else
|
||||
debugMode = Config.System.Debug
|
||||
end
|
||||
|
||||
Config.System.Menu = GetConvar("jim_menuScript", Config.System.Menu)
|
||||
Config.System.Notify = GetConvar("jim_notifyScript", Config.System.Notify or "gta")
|
||||
Config.System.ProgressBar = GetConvar("jim_progressBarScript", Config.System.ProgressBar or "gta")
|
||||
|
||||
15
version.txt
15
version.txt
@@ -1,11 +1,10 @@
|
||||
2.1.07
|
||||
2.1.08
|
||||
|
||||
- Support for new embeded shop recipes
|
||||
- Add checks for targets set with minZ and maxZ set too high or low
|
||||
- New target function `createPropTarget()` which creates a box target based on a prop model
|
||||
- Add CodeM as option for billing
|
||||
- Add 17Mov progressbar support
|
||||
- Fix OrigenInv calling OX_Inv to get player inventory
|
||||
- Allow "Grab Boxes" to have custom slots and weight
|
||||
- Fix getStash() always trying to use fallback functions
|
||||
- Start adding stashEditMetadata() function - wip
|
||||
- Add check for broken/missing config.lua in scripts
|
||||
- Add fix for debugMode breaking if no config file
|
||||
- Add a callback to check for society bank balances
|
||||
- Add player head movement for `lookEnt()` to continue looking after turning
|
||||
|
||||
https://github.com/jimathy/jim_bridge/releases/latest
|
||||
Reference in New Issue
Block a user