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_e301_02.mdl
+++ b/nwnds_overland/ttd21_e301_02.mdl
@@ -174,7 +174,11 @@ node trimesh shadowup.001
  Specular 0.0 0.0 0.0 
  shininess 0
  center -200.0 200.0 25.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 18
    -4.8 1.0 0.5
    -0.74 -1.18 0.26
@@ -736,7 +740,11 @@ node trimesh floor14.005
  Specular 0.0 0.0 0.0 
  shininess 10
  center 0.0 0.0 1133.69 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 61
    4.82 -1.37 12.0
    2.81 -0.68 11.53