FS Features #52
Merged
FS Features #52
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…oaded pk3s when referenced by the server. Ported from jk2mv.
Add ref_whitelist.txt, ref_blacklist.txt and ref_forcelist.txt. Refactor reference handling to be more predictable (by making the reference conditions more explicit).
As many users don't review the content of pk3s when installing mods and as cl_allowDownload can download pk3s from the server the pk3 files in the gamne folder should not be considered trustworthy enough to run native libraries from. In case a user really needs it the unpacking of native libraries can be reenabled with a protected init cvar: com_unpackLibraries.
As the filesystem is initialized before the network socket the file descriptors of the ip_socket turns out to be very high if many pk3s are loaded. When calling NET_Sleep the select call is used to sleep unless something arrives on the network socket. Due to its high number the highestfd value given to the select call is very high and covers alls open files, leading to high load on some systems. As a workaround this commit calls NET_Init before initializing the filesystem.
…lds a handle for a file inside of a pk3.
…imum allowed file descriptors to 4096 on start (can be overriden with "-maxfds" on launch). Ported from jk2mv.
If cl_downloadPrompt is enabled users have to confirm each pk3 download now. If cl_downloadOverlay is enabled the window used for the confirmation prompt is used to display a progress bar and details on the current download.
…led by default and requires user confirmation.
# Conflicts: # code/client/client.h # code/qcommon/common.cpp # code/qcommon/files.cpp # code/qcommon/qcommon.h # code/ui/ui_main.cpp # codemp/client/cl_main.cpp # codemp/client/client.h # codemp/qcommon/files.cpp # shared/sys/sys_main.cpp
…acked and used from pk3s, unless the game is started with com_unpackLibraries enabled, we revert back to installing the dlls to the /EternalJK/ directory and no longer packing them into a pk3.
Since com_unpackLibraries defaults to 0 the game is not going to unpack the default libraries from the assets anymore, thus the OpenJK ones should now be used as default.
# Conflicts: # codemp/cgame/CMakeLists.txt # codemp/game/CMakeLists.txt # codemp/ui/CMakeLists.txt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge @Daggolin's FS featured PR from JACoders#1185
Changes: