Merge branch 'wip' into lua

# Conflicts: # Misc/qs_pak/scripts/menus.lua
alexey-lysiuk · Nov 20, 2023 · 57b40ab · 57b40ab
2 parents 93cb574 + f8f9ce2
commit 57b40ab
Show file tree

Hide file tree

Showing 13 changed files with 15,426 additions and 154 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -560,6 +560,9 @@ if(QUAKE_BUILD_ENGINE_PAK)
 		maps/[email protected]
 		maps/[email protected]
 		maps/[email protected]
+		maps/[email protected]
+		maps/[email protected]
+		maps/[email protected]
 		scripts/edicts.lua
 		scripts/menus.lua
 		default.cfg