Akkariin/cfx-server-data
1
0
Fork 0
mirror of https://github.com/citizenfx/cfx-server-data.git synced 2025-01-26 03:53:21 +08:00
Code Issues Releases Wiki Activity
124 Commits 8 Branches 0 Tags 1.3 GiB
b7d053f31b
Commit Graph

124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
blattersturm
b7d053f31b fix(sessionmanager/rdr3): respond to game's TransitionToSession message 
This fixes the game bailing with BAIL_ERROR_SESSION_ERROR shortly after initializing (due to this message timing out).
 2021-03-14 11:18:12 +01:00
blattersturm
f8ae027428 tweak(sessionmanager/rdr3): correctly request a session transition 
This is untested with other players - hopefully it doesn't lead to a rejection. Needs latest change in client code, too.
 2021-03-06 10:00:42 +01:00
リーフストーム
7680f316a7
Merge pull request #144 from d0p3t/master 
builders: Fix webpack builder lock for multiple configs
 2021-01-14 09:56:41 +01:00
d0p3t
e2fe323d88 Set 'buildingInProgress' to false after successful config build to not lock other builds 
- Log build in progress to console
- webpack, not weebpack, weebs!
- Add yarn.lock
 2021-01-13 20:45:09 +01:00
リーフストーム
88f4f974b8
Merge pull request #140 from citizenfx/dependabot/npm_and_yarn/resources/gameplay/chat/ini-1.3.8 
build(deps): bump ini from 1.3.5 to 1.3.8 in /resources/[gameplay]/chat
 2020-12-13 17:52:45 +01:00
dependabot[bot]
f31fa859c8
build(deps): bump ini from 1.3.5 to 1.3.8 in /resources/[gameplay]/chat 
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-13 07:00:51 +00:00
リーフストーム
c75152c238
Merge pull request #138 from Zeemahh/fix/chat-scroll 
fix: scroll bug when switching chat channel (isChannel)
 2020-12-04 17:26:35 +01:00
zeemah
f77b765d97 fix: scroll bug when switching chat channel (isChannel) 2020-11-30 03:34:14 +00:00
Technetium
6eaa3525a6
Fix symlink targets. 
Targets are relative from the link, not the current directory.
 2020-11-26 17:00:22 +01:00
tabarra
ab4eccec83
Added metadata to all manifest files (#136) 
* ton of stuf

* more

* system resources: added fxmanifest meta tags

* manager resources: added fxmanifest meta tags

* gameplay resources: added fxmanifest meta tags

* gamemode resources: added fxmanifest meta tags

* gameplay example resources: reverted descriptions

* test resources: added fxmanifest meta tags

* smol fixes

* added author email + minor changes

* fixed manifest file trailing line inconsistencies

* Update fxmanifest.lua

* Update fxmanifest.lua

* Update fxmanifest.lua

* Update fxmanifest.lua

* Update fxmanifest.lua

* Update fxmanifest.lua

* Update fxmanifest.lua

* Update fxmanifest.lua

* Update __resource.lua

* additional phrasing/branding changes

Co-authored-by: PLOKMJNB <PLOKMJNB@users.noreply.github.com>
Co-authored-by: Danish Khan <61810778+PLOKMJNB@users.noreply.github.com>
Co-authored-by: Technetium <65681715+technetium-cfx@users.noreply.github.com>
Co-authored-by: blattersturm <peachypies@protonmail.ch>
 2020-11-22 16:49:22 +01:00
Technetium
76dd66bd0f
Merge pull request #110 from tabarra/patch-2 
removed bugged spawnpoint
 2020-11-10 01:03:56 +01:00
blattersturm
9520eaf41b Merge branch 'v2.1' 2020-11-02 15:12:15 +01:00
blattersturm
5073447ef4 gameplay: example money, money fountain, ped money drop and player ID systems 2020-11-01 14:28:11 +01:00
blattersturm
537eae7a00 mapmanager: allow vector/quat 2020-11-01 12:49:37 +01:00
blattersturm
e0212e5ea7 gitignore: ignore /db/ too 2020-11-01 12:49:11 +01:00
blattersturm
439b8a9c45 chatv2: channels, hidden modes and automatic webpack 2020-11-01 12:48:44 +01:00
blattersturm
65fc598a5f builders: fix webpack and improve yarn 2020-11-01 12:48:04 +01:00
blattersturm
7cbf600593 tweak(yarn): update yarn_cli.js to 1.22.5 2020-09-09 10:37:08 +02:00
blattersturm
25fd26e2e4 fix(yarn): per-server cache folder, mutex, cleaner phrasing for reinit, cleaner async call 2020-09-09 10:35:26 +02:00
tabarra
46a308b290
removed bugged spawnpoint 2020-06-26 03:10:16 -03:00
リーフストーム
dd38bd0192
Merge pull request #105 from ESX-Org/master 
Make spawnmanager exports available synchronously
 2020-06-04 14:10:49 +02:00
Blue
2998a23ced
fix playernames serverside memory leak (#106) 
* Update playernames_sv.lua

* Update playernames_cl.lua

* Update playernames_sv.lua

* clean up
 2020-06-04 14:10:25 +02:00
Jérémie N'gadi
296226b734 Make spawnmanager exports available synchrounously 2020-06-03 12:47:49 +02:00
astatine
99dac40452 chat2: fix hide state being permanently overridden when faded out/paused 2020-05-03 20:33:29 +02:00
astatine
872731b0ac chat2: remove Chat: prefix from display mode configuration 2020-04-27 11:31:04 +02:00
astatine
1c41359493 chat2: fix routing policy for / and say, add mode to hook data 2020-04-27 11:30:50 +02:00
astatine
abb38d4ff1 chat: only call RegisterKeyMapping when defined 2020-04-13 07:45:30 +02:00
astatine
adfdb89895 chat: register playerJoining 2020-04-13 07:45:09 +02:00
astatine
6ce5d8b3c1 chat: add support for seObject field for modes and setSeObject for modes/hooks 2020-04-12 22:17:33 +02:00
astatine
c94cc7cba7 chat: wip rework as chat2 2020-04-12 15:16:02 +02:00
astatine
2bde7889b4 spawnmanager: fix respawning on rdr 2019-12-12 18:53:51 +01:00
astatine
dbdd474310 add compatibility fivem game mode 2019-12-10 11:01:48 +01:00
astatine
ea6f1d8133 mapmanager: only load maps matching current game 2019-12-10 11:00:37 +01:00
astatine
e7f7519e45 update yarn_cli.js 2019-12-10 10:57:34 +01:00
astatine
5ca4612547 work on __resource -> fxmanifest and RDR compatibility 2019-12-10 10:57:04 +01:00
astatine
4fff23e2ff readme, .gitignore update, resources/local dir 2019-12-10 09:56:20 +01:00
astatine
51cc79eda2 reorganize resource directories 2019-12-10 09:54:29 +01:00
リーフストーム
60da977c02
Merge pull request #83 from GiroudMathias/master 
Webpack and Yarn builders update
 2019-11-20 20:11:24 +01:00
GiroudMathias
3bac230553 update webpack and yarn builders 
Updating the WebPack and Yarn builders so that they do not launch simultaneously. Compiling some modules simultaneously causes conflicts/crashes
 2019-11-20 16:00:19 +01:00
Darkotus
85419a6145 webpack builder: update packeges of package.json 2019-11-18 12:57:05 +01:00
blattersturm
bbc77613f0 rconlog: check for host id 2019-10-21 15:05:43 +02:00
blattersturm
54f75bca86 runcode: improved UI, in-game support, JS support 2019-10-21 15:04:55 +02:00
iridium
64a26ad1de spawnmanager: fix spawning when faded out, add skipFade option, add timeout for collision loading 2019-06-05 15:11:20 +02:00
iridium
23a840f780 mapmanager: better randomized roundEnd map rotation 2019-06-05 15:10:44 +02:00
moscovium
3c6a2b6859 builders: webpack: cache input file state and only rebuild when needing to 2019-01-15 14:00:11 +01:00
moscovium
2bc68781fc builders: update Yarn to 1.13.0 2019-01-15 13:58:27 +01:00
moscovium
2dc08b5dbe builders: remove server_only as this will lead to client errors with dependencies 2019-01-15 13:57:55 +01:00
リーフストーム
16243422bd
Merge pull request #16 from Bluethefurry/master 
fix broken link in "keks" comment
 2018-10-27 10:44:44 +02:00
リーフストーム
c49db60df7
Merge pull request #34 from vecchiotom/master 
fix names with color codes coloring the whole console output.
 2018-10-27 10:44:26 +02:00
リーフストーム
995791bd1a
Merge pull request #36 from klingni/master 
Add NetId for the vehicles.
 2018-10-27 10:44:17 +02:00