DominikSLK/cfx-server-data
1
0
Fork 0
mirror of https://github.com/citizenfx/cfx-server-data.git synced 2025-12-12 06:14:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

work on __resource -> fxmanifest and RDR compatibility

Browse Source
This commit is contained in:
astatine
2019-12-10 10:57:04 +01:00
parent 4fff23e2ff
commit 5ca4612547
31 changed files with 602 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/[gameplay]/chat-theme-gtao/__resource.lua → resources/[gameplay]/chat-theme-gtao/fxmanifest.lua
View File

@@ -7,4 +7,7 @@ chat_theme 'gtao' {
msgTemplates = {
default = '<b>{0}</b><span>{1}</span>'
}
}
}
game 'common'
fx_version 'adamant'

40
resources/[gameplay]/chat-theme-gtao/style.css
View File

@@ -3,10 +3,10 @@
}
.chat-window {
--size: calc((((2.7vw / 1.77777) * 1.2)) * 6);
--size: calc(((2.7vh * 1.2)) * 6);
position: absolute;
right: calc(1.56vw);
right: calc(2.77vh);
top: calc(50% - (var(--size) / 2));
height: var(--size) !important;
@@ -33,10 +33,10 @@
font-family: Font2, sans-serif;
color: #fff;
font-size: calc(1.8vw / 1.77777); /* 13px in 720p, calc'd by width */
font-size: calc(1.8vh); /* 13px in 720p, calc'd by width */
filter: url(#svgDropShadowFilter);
line-height: calc((2.7vw / 1.77777) * 1.2);
line-height: calc(2.7vh * 1.2);
margin-bottom: 0;
}
@@ -55,7 +55,7 @@
line-height: 1;
font-size: calc(2.7vw / 1.77777); /* 13px in 720p, calc'd by width */
font-size: calc(2.7vh);
}
.msg > span > span > span {
@@ -69,8 +69,8 @@
.chat-input {
position: absolute;
right: calc(1.56vw);
bottom: calc(1.56vw);
right: calc(2.77vh);
bottom: calc(2.77vh);
background: inherit !important;
@@ -86,7 +86,7 @@
.chat-input > div {
background-color: rgba(0, 0, 0, .6);
padding: calc(0.15625vw / 2);
padding: calc(0.28vh / 2);
}
.chat-input .prefix {
@@ -97,20 +97,32 @@
.chat-input > div + div {
position: absolute;
bottom: calc(1.65vh + 0.15625vw + 0.15625vw + 0.15625vw + (0.15625vw / 2));
bottom: calc(1.65vh + 0.28vh + 0.28vh + 0.28vh + (0.28vh / 2));
width: 99.6%;
text-align: left;
}
.suggestions {
border: calc(0.15625vw / 2) solid rgba(180, 180, 180, .6);
border: calc(0.28vh / 2) solid rgba(180, 180, 180, .6);
background: transparent;
}
textarea {
background: transparent;
border: calc(0.15625vw / 2) solid rgba(180, 180, 180, .6);
padding: calc(0.15625vw / 2);
padding-left: calc(3.5% + (0.15625vw / 2));
}
border: calc(0.28vh / 2) solid rgba(180, 180, 180, .6);
padding: calc(0.28vh / 2);
padding-left: calc(3.5% + (0.28vh / 2));
}
@media screen and (min-aspect-ratio: 21/9) {
.chat-window, .chat-input {
right: calc(12.8vw);
}
}
@media screen and (min-aspect-ratio: 32/9) {
.chat-window, .chat-input {
right: calc(25vw);
}
}

6
resources/[gameplay]/chat/cl_chat.lua
View File

@@ -1,3 +1,5 @@
local isRDR = not TerraingridActivate and true or false
local chatInputActive = false
local chatInputActivating = false
local chatHidden = true
@@ -194,7 +196,7 @@ Citizen.CreateThread(function()
Wait(0)
if not chatInputActive then
if IsControlPressed(0, 245) --[[ INPUT_MP_TEXT_CHAT_ALL ]] then
if IsControlPressed(0, isRDR and `INPUT_MP_TEXT_CHAT_ALL` or 245) --[[ INPUT_MP_TEXT_CHAT_ALL ]] then
chatInputActive = true
chatInputActivating = true
@@ -205,7 +207,7 @@ Citizen.CreateThread(function()
end
if chatInputActivating then
if not IsControlPressed(0, 245) then
if not IsControlPressed(0, isRDR and `INPUT_MP_TEXT_CHAT_ALL` or 245) then
SetNuiFocus(true)
chatInputActivating = false

56
resources/[gameplay]/chat/__resource.lua → resources/[gameplay]/chat/fxmanifest.lua
View File

@@ -1,26 +1,30 @@
description 'chat management stuff'
ui_page 'html/index.html'
client_script 'cl_chat.lua'
server_script 'sv_chat.lua'
files {
'html/index.html',
'html/index.css',
'html/config.default.js',
'html/config.js',
'html/App.js',
'html/Message.js',
'html/Suggestions.js',
'html/vendor/vue.2.3.3.min.js',
'html/vendor/flexboxgrid.6.3.1.min.css',
'html/vendor/animate.3.5.2.min.css',
'html/vendor/latofonts.css',
'html/vendor/fonts/LatoRegular.woff2',
'html/vendor/fonts/LatoRegular2.woff2',
'html/vendor/fonts/LatoLight2.woff2',
'html/vendor/fonts/LatoLight.woff2',
'html/vendor/fonts/LatoBold.woff2',
'html/vendor/fonts/LatoBold2.woff2',
}
description 'chat management stuff'
ui_page 'html/index.html'
client_script 'cl_chat.lua'
server_script 'sv_chat.lua'
files {
'html/index.html',
'html/index.css',
'html/config.default.js',
'html/config.js',
'html/App.js',
'html/Message.js',
'html/Suggestions.js',
'html/vendor/vue.2.3.3.min.js',
'html/vendor/flexboxgrid.6.3.1.min.css',
'html/vendor/animate.3.5.2.min.css',
'html/vendor/latofonts.css',
'html/vendor/fonts/LatoRegular.woff2',
'html/vendor/fonts/LatoRegular2.woff2',
'html/vendor/fonts/LatoLight2.woff2',
'html/vendor/fonts/LatoLight.woff2',
'html/vendor/fonts/LatoBold.woff2',
'html/vendor/fonts/LatoBold2.woff2',
}
fx_version 'adamant'
games { 'rdr3', 'gta5' }
rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'

3
resources/[gameplay]/playernames/__resource.lua → resources/[gameplay]/playernames/fxmanifest.lua
View File

@@ -24,4 +24,5 @@ files {
}
-- support the latest resource manifest
resource_manifest_version '05cfa83c-a124-4cfa-a768-c24a5811d8f9'
fx_version 'adamant'
game 'gta5'