Merge remote-tracking branch 'remaster/master'

0lvin · Oct 9, 2024 · d52dbea · d52dbea
2 parents 34c78d4 + 15a5f65
commit d52dbea
Show file tree

Hide file tree

Showing 93 changed files with 56,650 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -380,7 +380,6 @@ set(Game-Source
 	${GAME_SRC_DIR}/monster/demon/demon.c
 	${GAME_SRC_DIR}/monster/dog/dog.c
 	${GAME_SRC_DIR}/monster/enforcer/enforcer.c
-	${GAME_SRC_DIR}/monster/fish/fish.c
 	${GAME_SRC_DIR}/monster/fixbot/fixbot.c
 	${GAME_SRC_DIR}/monster/flipper/flipper.c
 	${GAME_SRC_DIR}/monster/float/float.c
@@ -400,6 +399,7 @@ set(Game-Source
 	${GAME_SRC_DIR}/monster/mutant/mutant.c
 	${GAME_SRC_DIR}/monster/ogre/ogre.c
 	${GAME_SRC_DIR}/monster/parasite/parasite.c
+	${GAME_SRC_DIR}/monster/rotfish/fish.c
 	${GAME_SRC_DIR}/monster/shalrath/shalrath.c
 	${GAME_SRC_DIR}/monster/shambler/shambler.c
 	${GAME_SRC_DIR}/monster/soldier/soldier.c

diff --git a/doc/100_tested_maps.md b/doc/100_tested_maps.md
@@ -241,7 +241,7 @@ Additionally supported models:
  | progs/demon.mdl            | models/monsters/demon/tris.mdl    | 4c73786e7cfb2083ca38cbc983cd6c4b |
  | progs/dog.mdl              | models/monsters/dog/tris.mdl      | e727fbc39acc652f812972612ce37565 |
  | progs/enforcer.mdl         | models/monsters/enforcer/tris.mdl | 136c265f96d6077ee3312c52e134529f |
- | progs/fish.mdl             | models/monsters/fish/tris.mdl     | d770d6ef92ae8b372926e6c3d49e8716 |
+ | progs/fish.mdl             | models/monsters/rotfish/tris.mdl  | d770d6ef92ae8b372926e6c3d49e8716 |
  | progs/hknight.mdl          | models/monsters/hknight/tris.mdl  | ed20e30be6fdb83efbaa6d0b23671a49 |
  | progs/knight.mdl           | models/monsters/knight/tris.mdl   | 5328915db5c53e85cf75d46e7b747fb9 |
  | progs/ogre.mdl             | models/monsters/ogre/tris.mdl     | fbb592ca3788a576dd2f31fcf8c80fab |