Merge branch 'nwnds_acidchalk'

2021-07-30 07:56:33 -04:00
parent c5a358631d e5772c4db7
commit ba375e1833
692 changed files with 75779 additions and 0 deletions
--- a/nwnds_overland/ttd21_w200_01.mdl
+++ b/nwnds_overland/ttd21_w200_01.mdl
@@ -84,7 +84,11 @@ node trimesh nmc_07da5e70.005
  diffuse 1 1 1
  specular 0 0 0
  selfillumcolor 0 0 0
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  shininess 32
  render 1
  shadow 0