Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FS Features #52

Merged
merged 21 commits into from
Nov 28, 2023
Merged

FS Features #52

merged 21 commits into from
Nov 28, 2023

Conversation

taysta
Copy link
Owner

@taysta taysta commented Nov 27, 2023

Merge @Daggolin's FS featured PR from JACoders#1185

Changes:

  • Reverted EternalJK's fs_globalcfg & fs_loadpakdlls,
  • Set fs_forcegame default to "EternalJK "to retain previous behaviour.
  • Make cmake put module dlls in the install folder instead of a pk3
  • As native libraries (dlls on Windows) are no longer automatically unpacked 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.
  • japro noDL prefixed pk3s are added to the blacklist

Daggolin and others added 11 commits November 6, 2023 17:40
…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.
…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
@taysta taysta marked this pull request as draft November 27, 2023 17:05
@taysta taysta changed the title FS Features by Daggo FS Features from JK2MV Nov 27, 2023
@taysta taysta changed the title FS Features from JK2MV FS Features Nov 27, 2023
…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.
taysta and others added 6 commits November 28, 2023 19:46
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
@taysta taysta marked this pull request as ready for review November 28, 2023 21:14
@taysta taysta merged commit 596ae40 into master Nov 28, 2023
12 checks passed
@taysta taysta deleted the daggo-fs branch November 28, 2023 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants