Uploaded fixed overland hak

Uploaded fixed overland hak.
2021-07-30 21:53:04 -04:00
parent 818f5318d6
commit d6b5135161
657 changed files with 0 additions and 23676 deletions
--- a/nwnds_overland/ttd21_s200_05.mdl
+++ b/nwnds_overland/ttd21_s200_05.mdl
@@ -796,11 +796,7 @@ node trimesh wok01
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 32.5 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 46
    -5.0 -5.0 0.0
    -2.5 -5.0 0.0
@@ -977,11 +973,7 @@ node aabb wok01
  orientation 1.0 0.0 0.0 0.0
  wirecolor 0.0 0.0 0.0 
  multimaterial 2
-<<<<<<< HEAD
-    ttd21_sand01
-=======
    trd21_sand08
->>>>>>> nwnds_acidchalk
    ds_tt_stucco06
  bitmap NULL
  verts 142