Merge pull request #36 from GeorgePieVG/credits-textfix

Update credits, remove text generator
Catoptromancy · Oct 13, 2024 · 47e1220 · 47e1220
2 parents e9d205c + 95e1ca0
commit 47e1220
Show file tree

Hide file tree

Showing 11 changed files with 176 additions and 287 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,3 @@ wad*.txt
 /lumps/genmidi/*.lmp
 /lumps/textures/blasphdm/
 /lumps/textures/blasphem/
-
-/lumps/bsph*tl.png
-/lumps/text/*.png
diff --git a/CREDITS.md b/CREDITS.md
@@ -4,12 +4,12 @@ CREDITS.md:
 
 G. "Stilgar" Wessner - Graphics, Former Project Lead
 Jute Gyte - Music and Sound, Level Design, Former Project Lead
-Sodaholic - Sounds and Graphics, Former Project Maintainer, Former Project Lead
+Blastfrog - Sounds and Graphics, Former Project Maintainer, Former Project Lead
 Springy - Project Lead
 Cacowad - Level Design, Project Mantainer
 DooMAD - Graphics
 Blox - Graphics
-Eriance - Weapon Graphics
+Amuscaria - Weapon Graphics, Sprites
 Warfare - Graphics
 Leilei - Base Data, Graphics
 Esselfortium - Graphics
@@ -36,14 +36,13 @@ BethOfDeath - Graphics
 Lokito - Graphics
 Linguica - Graphics
 BigProjectAlone - Graphics
-HorrorMovieGuy - Graphics
+HorrorMovieRei - Graphics
 Suporma - Level Design
 Craneo - Level Design
 EttinGrinder - Level Design
 AntonR - Sounds, Sprites
 MrFlibble - Graphics
 GeorgePieVG - Scripts, Sprites
-Amuscaria - Sprites
 MoonDeLaAxel - Sounds
 KatherineCode - Sprites
 Desfar - Sprites

diff --git a/FORK_Scripts.txt b/FORK_Scripts.txt
@@ -1,7 +1,7 @@
 ### Scripts ### - Cato
 
 ### Update Titlepic ###
-# rm lumps/title.png && convert lumps/help1.gif -pointsize 10 -gravity east  -font  NimbusRoman-Bold -fill white  -draw "text 5,95 '2024 v 0.1.9-fork-002 '" lumps/title.png
+# rm lumps/title.png && convert lumps/titlepic.png -pointsize 10 -gravity east  -font  NimbusRoman-Bold -fill white  -draw "text 5,95 '2024 v 0.1.9-fork-002 '" lumps/title.png
 
 ### Prepare and Push Commit ###
 # rm blasphem.zip && rm blasphdm.zip && make

diff --git a/Makefile b/Makefile
@@ -18,7 +18,6 @@ OBJS=$(BLASPHEM) $(BLASPHDM)
 all: deutex-check $(OBJS)
 
 subdirs:
-	$(MAKE) VERSION=$(VERSION) -C lumps/text
 	$(MAKE) -C lumps/genmidi
 	$(MAKE) -C lumps/dmxgus
 	$(MAKE) -C lumps/textures
@@ -76,7 +75,6 @@ clean:
 	rm wadinfo_blasphem.txt
 	rm wadinfo_blasphdm.txt
 
-	$(MAKE) -C lumps/text clean
 	$(MAKE) -C lumps/genmidi clean
 	$(MAKE) -C lumps/dmxgus clean
 	$(MAKE) -C lumps/textures clean