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_e150_02.mdl
+++ b/nwnds_overland/ttd21_e150_02.mdl
@@ -333,7 +333,11 @@ node trimesh nmc_085396fc
  shininess 26
  shadow 0
  rotatetexture 1
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  orientation 0 0 0 0
  scale 1
  alpha 1
@@ -392,7 +396,11 @@ node trimesh nmc_08539b94
  shininess 1
  shadow 0
  rotatetexture 1
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  orientation 0 0 0 0
  scale 1
  alpha 1