???

2021-08-16 10:39:21 -04:00
parent a7f9fcdebe
commit b502bde656
2458 changed files with 62 additions and 1800044 deletions
--- a/nwnds_overland/bug01_n12_01.mdl
+++ b/nwnds_overland/bug01_n12_01.mdl
@@ -48,7 +48,11 @@ node aabb wok_194
  orientation 1.0 0.0 0.0 0.0
  wirecolor 0.0 0.0 0.0 
  multimaterial 31
+<<<<<<< HEAD
+    ttd21_sand01
+=======
    trd21_sand08
+>>>>>>> nwnds_acidchalk
    Dirt
    Obscuring
    Grass
--- a/nwnds_overland/bug01_p02_01.mdl
+++ b/nwnds_overland/bug01_p02_01.mdl
@@ -48,7 +48,11 @@ node aabb wok_212
  orientation 1.0 0.0 0.0 0.0
  wirecolor 0.0 0.0 0.0 
  multimaterial 31
+<<<<<<< HEAD
+    ttd21_sand01
+=======
    trd21_sand08
+>>>>>>> nwnds_acidchalk
    Dirt
    Obscuring
    Grass
--- a/nwnds_overland/dsc01_ph1_04.mdl
+++ b/nwnds_overland/dsc01_ph1_04.mdl
@@ -4468,7 +4468,11 @@ node trimesh ground01
  specular 0 0 0
  shininess 1
  center 0 0 0
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 16
    -5 -5 0
    -2.5 -5 0
--- a/nwnds_overland/ttd21_a01_01.mdl
+++ b/nwnds_overland/ttd21_a01_01.mdl
@@ -63,7 +63,11 @@ node trimesh sand
  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
--- a/nwnds_overland/ttd21_b030_09.mdl
+++ b/nwnds_overland/ttd21_b030_09.mdl
@@ -2772,7 +2772,11 @@ node trimesh groundbot99
  specular 0 0 0
  shininess 1
  center -340.5 1.50002 43.5
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 104
    1.39 4.8 -0.46
    -0.96 4.81 0.04
--- a/nwnds_overland/ttd21_b114_01.mdl
+++ b/nwnds_overland/ttd21_b114_01.mdl
@@ -107,7 +107,11 @@ node trimesh Plane41
  Specular 0.0 0.0 0.0 
  shininess 1
  center 336.0 395.5 0.0 
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 58
    -5.0 5.0 0.0
    5.0 5.0 0.0
--- a/nwnds_overland/ttd21_b121_01.mdl
+++ b/nwnds_overland/ttd21_b121_01.mdl
@@ -372,7 +372,11 @@ node trimesh wok01
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 332.5 
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 46
    -5.0 -5.0 3.0
    -2.5 -5.0 3.0
--- a/nwnds_overland/ttd21_d005_04.mdl
+++ b/nwnds_overland/ttd21_d005_04.mdl
@@ -263,7 +263,11 @@ node trimesh wok002
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 37.5 
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 46
    -5.0 -5.0 0.0
    -2.5 -5.0 0.0
--- a/nwnds_overland/ttd21_e003_01.mdl
+++ b/nwnds_overland/ttd21_e003_01.mdl
@@ -685,7 +685,11 @@ node trimesh ground_01
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 650.0 
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 99
    5.0 1.0 5.0
    5.0 3.0 5.0
--- a/nwnds_overland/ttd21_e303_03.mdl
+++ b/nwnds_overland/ttd21_e303_03.mdl
@@ -142,7 +142,11 @@ node trimesh floor138.002
  Specular 0.0 0.0 0.0 
  shininess 10
  center 0.0 0.0 2016.21 
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 38
    5.0 4.2 20.8
    5.0 5.0 21.0
--- a/nwnds_overland/ttd21_e304_03.mdl
+++ b/nwnds_overland/ttd21_e304_03.mdl
@@ -33,7 +33,11 @@ node trimesh plane20.002
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 40.0 
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 37
    -5.0 -1.0 0.0
    -5.0 -5.0 0.0
@@ -188,7 +192,11 @@ node trimesh floor14.009
  Specular 0.0 0.0 0.0 
  shininess 10
  center 460.0 460.0 1390.0 
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 8
    -4.2 4.5 13.8
    -4.2 5.0 13.8
--- a/nwnds_overland/ttd21_w201_01.mdl
+++ b/nwnds_overland/ttd21_w201_01.mdl
@@ -932,7 +932,11 @@ node trimesh object12.001
  ambient 1 1 1
  diffuse 1 1 1
  specular 0 0 0
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  shininess 1
  render 1
  shadow 0
--- a/nwnds_overland/twm_b049_05.mdl
+++ b/nwnds_overland/twm_b049_05.mdl
@@ -3477,7 +3477,11 @@ node trimesh wok008
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 1000.0 21.5 
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 358
    -5.0 -5.0 0.0
    -2.5 -5.0 0.0