Merge branch 'freedoom:master' into newhealthpickups

2025-09-01 22:25:46 -04:00 · 2023-02-27 07:38:27 -08:00 · 2023-02-27 07:38:27 -08:00 · d2f643a722
commit d2f643a722
parent bf9a4495f5 231d8bb2f5
16 changed files with 11 additions and 2 deletions
--- a/13
+++ b/13
@ -900,9 +900,10 @@ S: perry
 E: me@pprogs.blog
 D: levels

-S: shino1
+N: Ada Mackiewicz
+S: Shinosarna
 E: nobody.shinobi@gmail.com
-D: buildcfg.txt, sprites
+D: buildcfg.txt, levels, sprites

 N: Steven Elliott
 E: selliott512@gmail.com
@ -949,4 +950,12 @@ D: levels
 S: arborix
 D: sprites

+S: Inuk
+E: inuquire@gmail.com
+D: levels
+
+S: GojiBerry
+E: gojidoesit@proton.me
+D: levels
+
 =======
--- a/levels/e2m8.wad
+++ b/levels/e2m8.wad
--- a/levels/e3m6.wad
+++ b/levels/e3m6.wad
--- a/levels/e3m7.wad
+++ b/levels/e3m7.wad
--- a/levels/map06.wad
+++ b/levels/map06.wad
--- a/levels/map10.wad
+++ b/levels/map10.wad
--- a/levels/map12.wad
+++ b/levels/map12.wad
--- a/levels/map13.wad
+++ b/levels/map13.wad
--- a/levels/map14.wad
+++ b/levels/map14.wad
--- a/levels/map15.wad
+++ b/levels/map15.wad
--- a/levels/map16.wad
+++ b/levels/map16.wad
--- a/levels/map20.wad
+++ b/levels/map20.wad
--- a/levels/map23.wad
+++ b/levels/map23.wad
--- a/levels/map27.wad
+++ b/levels/map27.wad
--- a/levels/map28.wad
+++ b/levels/map28.wad
--- a/levels/map29.wad
+++ b/levels/map29.wad