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.

Sign up for GitHub

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

Jump to bottom

BUILD: Edits to build configuration, moved maps out of PAK files #224

Merged
merged 5 commits into from
Nov 8, 2024
Merged

BUILD: Edits to build configuration, moved maps out of PAK files #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a8311c
BUILD: Moved deathmatch maps outside of PAK1.PAK so they can be distr…
Zungrysoft Oct 29, 2024
32984c4
BUILD: Silence missing asset warning for lit files
Zungrysoft Oct 29, 2024
28219ff
BUILD: Moved engine-specific default.cfg files to PAK0
Zungrysoft Oct 29, 2024
270b5f0
BUILD: Removed 'DO NOT EDIT' warning from engine-specific default.cfg…
Zungrysoft Oct 29, 2024
deca8a4
BUILD: Lint fix
Zungrysoft Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ def build_file(source_path, destination_path, source_if_missing):
if len(source_if_missing):
shutil.copy(source_if_missing, destination_path)
else:
warnings.warn(f"Missing file with no substitute: {source_path}")
# No warning for lit files, since not all maps have them
if not destination_path.endswith(".lit"):
warnings.warn(f"Missing file with no substitute: {source_path}")


# Gets a source and dest path from a file entry File. Entries can be a string
Expand Down
12 changes: 6 additions & 6 deletions build_components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@
"source_if_missing": "",
"files_pak0": [
"default.cfg",
"default_$generic.cfg",
"default_fte.cfg",
"default_darkplaces.cfg",
"quake.rc"
],
"files_pak1": [],
"files_unpacked": [
["-config.cfg", "config.cfg"],
"cam.cfg",
"dev.cfg",
"default_$generic.cfg",
"default_fte.cfg",
"default_darkplaces.cfg",
"zoom90.cfg",
"zoom120.cfg",
"style_fte_modern.cfg",
Expand Down Expand Up @@ -498,7 +498,8 @@
"base_dir": "lq1",
"source_if_missing": "",
"files_pak0": [],
"files_pak1": [
"files_pak1": [],
"files_unpacked": [
"maps/lqdm1.bsp",
"maps/lqdm1.lit",
"maps/lqdm2.bsp",
Expand All @@ -525,8 +526,7 @@
"maps/lqdm12.lit",
"maps/lqdm13.bsp",
"maps/lqdm13.lit"
],
"files_unpacked": []
]
},

"lite_assets": {
Expand Down
6 changes: 3 additions & 3 deletions lq1/default_$generic.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ======================================================= //
// Engine-Specific Configuration - DO NOT EDIT THIS FILE! //
// ======================================================= //
// =============================================== //
// Engine-Specific Configuration for Other Engines //
// =============================================== //

// Ironwail and other Quakespasm Forks
gl_texture_anisotropy 2
Expand Down
6 changes: 3 additions & 3 deletions lq1/default_darkplaces.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// ======================================================= //
// Engine-Specific Configuration - DO NOT EDIT THIS FILE! //
// ======================================================= //
// ============================================ //
// Engine-Specific Configuration for DarkPlaces //
// ============================================ //
6 changes: 3 additions & 3 deletions lq1/default_fte.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ======================================================= //
// Engine-Specific Configuration - DO NOT EDIT THIS FILE! //
// ======================================================= //
// ======================================= //
// Engine-Specific Configuration For FTEQW //
// ======================================= //

// Console Vars
gl_texturemode2d nll
Expand Down
Loading