Importing distro files from Flatpak and Arch Linux

.github/workflows/build-linux.yml

@@ -25,14 +25,14 @@ jobs:
           build-essential \
           libgl1-mesa-dev \
           libsdl2-dev \
-          libcurl4-openssl-dev \
           libopenal-dev \
           libfreetype6-dev \
           zip \
+          libcurl4-openssl-dev \
           curl \
           rsync
     - name: make
-      run: USE_RESTCLIENT=1 USE_INTERNAL_LUA=1 make -j
+      run: USE_RESTCLIENT=1 USE_INTERNAL_LUA=1 USE_CURL_DLOPEN=0 make -j
     - name: download paks
       run: ./misc/download-paks.sh
     - name: change perms

.github/workflows/build-macos.yml

@@ -1,4 +1,4 @@
-name: Build MacOS 11
+name: Build for macOS
 
 on:
   push:
@@ -10,7 +10,7 @@ on:
 jobs:
   build:
 
-    runs-on: macos-11
+    runs-on: macos-13
     env:
       release_name: release-darwin-x86_64
 

.gitignore

@@ -2,10 +2,13 @@ build
 Makefile.local
 *.swp
 *tags
-misc/patches
-misc/last-merged-ioq3-revision.temp
+TAGS
 *~
 
+# CMake
+CMakeCache.txt
+CMakeFiles/
+
 # OS X
 ####################
 .Spotlight-V100/

Makefile

@@ -111,22 +111,38 @@ ifndef VERSION
 VERSION=1.3.0
 endif
 
+ifndef PACKAGE
+PACKAGE=tremulous
+endif
+
 ifndef CLIENTBIN
 CLIENTBIN=tremulous
 endif
 
+ifndef CLIENTBINSH
+CLIENTBINSH=$(CLIENTBIN).sh
+endif
+
 ifndef SERVERBIN
 SERVERBIN=tremded
 endif
 
+ifndef SERVERBINSH
+SERVERBINSH=$(SERVERBIN).sh
+endif
+
 ifndef BASEGAME
 BASEGAME=gpp
 endif
 
 BASEGAME_CFLAGS=-I../../${MOUNT_DIR}
 
+ifndef PREFIX
+PREFIX=/usr/local
+endif
+
 ifndef COPYDIR
-COPYDIR="/usr/local/games/tremulous"
+COPYDIR="$(PREFIX)/share/$(PACKAGE)"
 endif
 
 ifndef COPYBINDIR
@@ -256,6 +272,11 @@ endif
 BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
 BR=$(BUILD_DIR)/release-$(PLATFORM)-$(ARCH)
 
+# If build target not defined, assume release (for install target)
+# ifndef B
+# B=$(BR)
+# endif
+
 CDIR=$(MOUNT_DIR)/client
 SDIR=$(MOUNT_DIR)/server
 RCOMMONDIR=$(MOUNT_DIR)/renderercommon
@@ -339,8 +360,10 @@ INSTALL=install
 MKDIR=mkdir
 EXTRA_FILES=
 CLIENT_EXTRA_FILES=
+INSTALL_DIR=
 
 ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
+  INSTALL_DIR=/opt/tremulous-grangerhub
   BASE_CFLAGS += -DUSE_ICON
   CLIENT_CFLAGS += $(SDL_CFLAGS)
 
@@ -1130,6 +1153,9 @@ release:
 	  OPTIMIZE="-DNDEBUG $(OPTIMIZE)" OPTIMIZEVM="-DNDEBUG $(OPTIMIZEVM)" \
 	  CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V)
 
+install: release
+	@$(MAKE) install_target B=$(BR)
+
 ifneq ($(call bin_path, tput),)
   TERM_COLUMNS=$(shell if c=`tput cols`; then echo $$(($$c-4)); else echo 76; fi)
 else
@@ -1225,14 +1251,15 @@ endif
 	@echo "  Output:"
 	$(call print_list, $(NAKED_TARGETS))
 	@echo ""
-	@$(MAKE) $(TARGETS) $(B).zip V=$(V)
+	@$(MAKE) $(TARGETS) $(B).zip $(B)/$(CLIENTBINSH) $(B)/$(SERVERBINSH) V=$(V)
 
 $(B).zip: $(TARGETS)
 ifeq ($(PLATFORM),darwin)
-	@("./make-macosx-app.sh" release $(ARCH); if [ "$$?" -eq 0 ] && [ -d "$(B)/Tremulous.app" ]; then rm -f $@; cd $(B) && zip --symlinks -r9 ../../$@ GPL COPYING CC `find "Tremulous.app" -print | sed -e "s!$(B)/!!g"`; else rm -f $@; cd $(B) && zip -r9 ../../$@ $(NAKED_TARGETS); fi)
+	@("./make-macosx-app.sh" release $(ARCH); if [ "$$?" -eq 0 ] && [ -d "$(B)/Tremulous.app" ]; then rm -f $@; cd $(B) && zip --symlinks -qr9 ../../$@ GPL COPYING CC `find "Tremulous.app" -print | sed -e "s!$(B)/!!g"`; else rm -f $@; cd $(B) && zip -qr9 ../../$@ $(NAKED_TARGETS); fi)
 else
 	@rm -f $@
-	@(cd $(B) && zip -r9 ../../$@ $(NAKED_TARGETS))
+	@(cd $(B) && zip -qr9 ../../$@ $(NAKED_TARGETS))
+	@echo "Created $@"
 endif
 
 makedirs:
@@ -2616,18 +2643,21 @@ $(B)/$(BASEGAME)_11/vm/ui.qvm: $(UIVMOBJ11) $(UIDIR)/ui_syscalls_11.asm $(Q3ASM)
 #############################################################################
 
 $(B)/$(BASEGAME)/vms-gpp-$(VERSION).pk3: $(B)/$(BASEGAME)/vm/ui.qvm $(B)/$(BASEGAME)/vm/cgame.qvm $(B)/$(BASEGAME)/vm/game.qvm
-	@(cd $(B)/$(BASEGAME) && zip -r vms-$(VERSION).pk3 vm/)
+	$(echo_cmd) "Created $@"
+	@(cd $(B)/$(BASEGAME) && zip -qr $(@F) vm/)
 
 $(B)/$(BASEGAME)_11/vms-1.1.0-$(VERSION).pk3: $(B)/$(BASEGAME)_11/vm/ui.qvm $(B)/$(BASEGAME)_11/vm/cgame.qvm 
-	@(cd $(B)/$(BASEGAME)_11 && zip -r vms-$(VERSION).pk3 vm/)
+	$(echo_cmd) "Created $@"
+	@(cd $(B)/$(BASEGAME)_11 && zip -qr $(@F) vm/)
 
 
 #############################################################################
 ## Assets Package
 #############################################################################
 
 $(B)/$(BASEGAME)/data-$(VERSION).pk3: $(ASSETS_DIR)/ui/main.menu
-	@(cd $(ASSETS_DIR) && zip -r data-$(VERSION).pk3 *)
+	$(echo_cmd) "Created $@"
+	@(cd $(ASSETS_DIR) && zip -qr data-$(VERSION).pk3 *)
 	@mv $(ASSETS_DIR)/data-$(VERSION).pk3 $(B)/$(BASEGAME)
 
 #############################################################################
@@ -2904,6 +2934,50 @@ distclean: clean toolsclean
 dist:
 	git archive --format zip --output $(CLIENTBIN)-$(VERSION).zip HEAD
 
+#############################################################################
+# INSTALL (only for Linux platforms)
+#############################################################################
+
+# Shell scripts for running binaries
+
+$(B)/$(CLIENTBINSH): 
+	@echo '#!/usr/bin/env sh' > $@
+	@echo 'cd $(COPYBINDIR)' >> $@
+	@echo './$(CLIENTBIN) "$$@"' >> $@
+
+$(B)/$(SERVERBINSH): 
+	@echo '#!/usr/bin/env sh' > $@
+	@echo 'cd $(COPYBINDIR)' >> $@
+	@echo './$(SERVERBIN) "$$@"' >> $@
+
+# Install the .desktop, icon files, license, etc.
+install_target: 
+ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
+	$(echo_cmd) "Downloading base Tremulous data and maps"
+	misc/download-paks.sh
+	$(echo_cmd) "Installing for Linux platform in $(PREFIX)"
+	@$(INSTALL) -d $(PREFIX)/bin "$(PREFIX)/share/metainfo" \
+			"$(PREFIX)/share/licenses/$(PACKAGE)" "$(PREFIX)/share/applications" \
+			"$(PREFIX)/share/icons/hicolor/128x128/apps" "$(COPYBINDIR)"
+	@cd $(BR) && for file in $(NAKED_TARGETS); do \
+		if [[ "$$file" == "scripts" ]]; then \
+			$(INSTALL) -d $(COPYBINDIR)/scripts; \
+			$(INSTALL) -t $(COPYBINDIR)/scripts scripts/*; \
+		else \
+			$(INSTALL) -D $$file $(COPYBINDIR)/$$file; \
+		fi \
+	done
+	$(INSTALL) -D -m755 $(BR)/$(CLIENTBINSH) $(PREFIX)/bin/tremulous
+	$(INSTALL) -D -m755 $(BR)/$(SERVERBINSH) $(PREFIX)/bin/tremded
+	$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.png" "$(PREFIX)/share/icons/hicolor/128x128/apps/"
+	$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.desktop" \
+			 "$(PREFIX)/share/applications/"
+	$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.appdata.xml" \
+			 "$(PREFIX)/share/metainfo/"
+	$(INSTALL) -D -m644 "COPYING" "GPL" "CC" "$(PREFIX)/share/licenses/$(PACKAGE)/"
+endif
+
+
 #############################################################################
 # DEPENDENCIES
 #############################################################################
@@ -2917,11 +2991,13 @@ endif
 .PHONY: all clean clean2 clean-debug clean-release \
 	debug default dist distclean makedirs release targets \
 	toolsclean toolsclean2 toolsclean-debug toolsclean-release \
-	$(OBJ_D_FILES) $(TOOLSOBJ_D_FILES) $(B)/scripts \
-	$(B)/$(BASEGAME)/data-$(VERSION).pk3 \
-	$(B)/$(BASEGAME)_11/vms-$(VERSION).pk3 \
-	$(B)/$(BASEGAME)/vms-$(VERSION).pk3 \
-	$(B).zip
+	$(OBJ_D_FILES) $(TOOLSOBJ_D_FILES) $(B)/scripts 
+
+# removing zip files from phony for install target not recreating them as root
+#	$(B)/$(BASEGAME)/data-$(VERSION).pk3 \
+#	$(B)/$(BASEGAME)_11/vms-$(VERSION).pk3 \
+#	$(B)/$(BASEGAME)/vms-$(VERSION).pk3 \
+#	$(B).zip
 
 # If the target name contains "clean", don't do a parallel build
 ifneq ($(findstring clean, $(MAKECMDGOALS)),)

misc/download-paks.sh

@@ -32,7 +32,7 @@ for dir in ./build/*; do
         if [[ -e $package ]]; then
             rm -f $package # only want 1 copy
         fi
-        curl -OL $URL/$i
+        curl -OL -C - $URL/$i
     done
 
     popd

misc/io.github.grangerhub.Tremulous.appdata.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2017-2025 Daniel Rusek <[email protected]> and Cengiz Gunay <[email protected]> -->
+<component type="desktop-application">
+  <id>io.github.grangerhub.Tremulous</id>
+  <project_license>GPL-2.0</project_license>
+  <metadata_license>CC-BY-SA-3.0</metadata_license>
+  <provides>
+    <id>io.github.grangerhub.Tremulous.desktop</id>
+  </provides>
+  <launchable type="desktop-id">io.github.grangerhub.Tremulous.desktop</launchable>
+  <name>Tremulous</name>
+  <developer_name>Dark Legion Development and GrangerHub</developer_name>
+  <summary>Aliens vs Humans, First Person Shooter game with elements of Real Time Strategy (GrangerHub version)</summary>
+  <description>
+    <p>
+      Tremulous is a free, open source game that blends a team based FPS with
+      elements of an RTS.
+    </p>
+    <p>
+      Players can choose from 2 unique races, aliens and humans.
+      Players on both teams are able to build working structures in-game like an
+      RTS. 
+    </p>
+    <p>
+      The GrangerHub version contains the updated game server and
+      client binaries with several stability improvements and new
+      features. See the homepage for more details.
+    </p>
+  </description>
+  <url type="homepage">https://github.com/GrangerHub/tremulous</url>
+  <screenshots>
+    <screenshot type="default">
+      <image type="source" width="1280" height="960">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-trem1.3-7d1b.jpg</image>
+      <caption>Tremulous 1.3 development with shadows</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1366" height="768">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-trem1.3-7672.jpg</image>
+      <caption>Tremulous 1.3 alien dragoon jumping over human player with portal gun</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1366" height="768">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-trem1.3-ca9d.jpg</image>
+      <caption>Human shooting alien acid tube with laser gun</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1366" height="768">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-trem1.3-7628.jpg</image>
+      <caption>Human base with medistation and armory</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1366" height="768">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-trem1.3-6d22.jpg</image>
+      <caption>Human with jetpack</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1366" height="768">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-trem1.3-e81b.jpg</image>
+      <caption>Human outside in ATCS map</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1918" height="1064">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-alien-granger.jpg</image>
+      <caption>Alien builder unit, granger, in front of its base with two eggs and overmind</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1918" height="1064">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-alien-dretch-base-build-bubbles.jpg</image>
+      <caption>Lowest alien unit, dretch, with red building proximity bubbles in ATCS map base</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1119" height="682">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-alien-upgrades.png</image>
+      <caption>Updated alien evolution targets dialog</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1918" height="1064">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-alien-basilisk-evolve.jpg</image>
+      <caption>Alien evolving into second stage unit, basilisk</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1918" height="1064">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-alien-basilisk-gas.jpg</image>
+      <caption>Alien basilisk releasing poison gas</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1918" height="1064">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-alien-marauder.jpg</image>
+      <caption>Alien third stage unit, marauder</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1918" height="1064">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-alien-marauder.jpg</image>
+      <caption>Alien third stage unit, marauder</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1918" height="1064">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-alien-dragoon.jpg</image>
+      <caption>Alien fourth stage unit, dragoon, during pounce</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1918" height="1064">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-alien-dragoon-front.jpg</image>
+      <caption>Alien dragoon - close up</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1918" height="1064">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-alien-tyrant-front.jpg</image>
+      <caption>Alien final stage unit, tyrant</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1918" height="1064">https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/screenshots/grangerhub-alien-tyrant-ret-smoke.jpg</image>
+      <caption>Alien tyrant rampaging in human base</caption>
+    </screenshot>
+    <screenshot>
+      <video>https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/videos/GrangerPub_Quick_Transit_Match-NewSource~tremulousrussian.mkv</video>
+      <caption>Quick match in Transit map. Credit: NewSource/TremulousRussian</caption>
+    </screenshot>
+    <screenshot>
+      <video>https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/videos/Tremulous_GPP_alien_gameplay-ZdrytchX~ViruS.webm</video>
+      <caption>Tremulous GPP alien gameplay. Credit: ZdrytchX/ViruS</caption>
+    </screenshot>
+  </screenshots>
+  <update_contact>[email protected]</update_contact>
+  <content_rating type="oars-1.1">
+    <content_attribute id="violence-fantasy">moderate</content_attribute>
+    <content_attribute id="violence-realistic">moderate</content_attribute>
+    <content_attribute id="violence-bloodshed">mild</content_attribute>
+    <content_attribute id="social-chat">intense</content_attribute>
+  </content_rating>
+</component>

misc/io.github.grangerhub.Tremulous.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Tremulous
+Comment=Aliens vs Humans, First Person Shooter game with elements of Real Time Strategy (GrangerHub version)
+Icon=io.github.grangerhub.Tremulous
+Exec=tremulous
+Terminal=false
+Type=Application
+Categories=Game;ActionGame;StrategyGame;Shooter;
+PrefersNonDefaultGPU=true

src/client/cl_curl.h

@@ -26,7 +26,7 @@ along with Tremulous; if not, see <https://www.gnu.org/licenses/>
 #define __QCURL_H__
 
 #ifdef USE_LOCAL_HEADERS
-#include "curl/curl.h"
+#include "../libcurl-7.35.0/curl/curl.h"
 #else
 #include <curl/curl.h>
 #endif