Merge origin/master

Locations/HamptonRoadsVirginia/Readme.txt

@@ -3,6 +3,6 @@
 1) There is a slight distortion caused by minor mismatch between the elevation data
 obtained from the USGS Seemless server and the NGA imagery.  The elevation data
 area coverage is somewhat smaller than the depicted imagery causing AUVW AMN
-mission to appear larger than they really are.  The only way to allievate this
+mission to appear larger than they really are.  The only way to alleviate this
 distortion is to precisely match the elevation data area coverage with the imagery
 area coverage to ensure a 1:1 for rendering.
\ No newline at end of file

Scenarios/PiracyIncidents/PiracyDisHelloWorld.x3d

@@ -11,9 +11,9 @@
     <meta content='build.xml' name='reference'/>
     <meta content='javadoc/index.html' name='reference'/>
     <meta content='http://www.3dtexture.net/img-blue-water-ocean-texture-250.htm' name='reference'/>
-    <meta content='Blue_water_ocean_texture.jpg' name='Image'/>
+    <meta content='BlueWaterOceanTexture.jpg' name='Image'/>
     <meta content='Piracy Distributed Interactive Simulation' name='subject'/>
-    <meta content='https://savage.nps.edu/Savage/Scenarios/Piracy/PiracyDisHelloWorld.x3d' name='identifier'/>
+    <meta content='https://savage.nps.edu/Savage/Scenarios/PiracyIncidents/PiracyDisHelloWorld.x3d' name='identifier'/>
     <meta content='X3D-Edit, https://savage.nps.edu/X3D-Edit' name='generator'/>
     <meta content='../../license.html' name='license'/>
   </head>
@@ -29,7 +29,7 @@
         <Box size='600 1 500'/>
         <Appearance>
           <Material diffuseColor='0.380392 0.607843 1'/>
-          <ImageTexture url='"Blue_water_ocean_texture.jpg" "https://savage.nps.edu/Savage/ShipsCivilian/Piracy/Blue_water_ocean_texture.jpg"'/>
+          <ImageTexture url='"BlueWaterOceanTexture.jpg" "https://savage.nps.edu/Savage/ShipsCivilian/Piracy/Ocean.ppg"'/>
         </Appearance>
       </Shape>
     </Transform>

ShipsCivilian/Tugboats/BoatTug02.x3d

@@ -63,17 +63,6 @@
           <TextureCoordinate USE='BoatTug02-TEXCOORD'/>
         </IndexedFaceSet>
       </Shape>
-      <Shape>
-        <Appearance>
-          <Material USE='Def23'/>
-          <ImageTexture url='"textures/BoatTug12.jpg" "https://savage.nps.edu/Savage/ShipsCivilian/Tugboats/textures/BoatTug12.jpg"'/>
-        </Appearance>
-        <IndexedFaceSet coordIndex='1 2 8 -1 5 9 6 -1' normalIndex='195 195 195 -1 127 127 127 -1' texCoordIndex='19 20 21 -1 16 17 18 -1'>
-          <Coordinate USE='BoatTug02-COORD'/>
-          <Normal USE='Def24'/>
-          <TextureCoordinate USE='BoatTug02-TEXCOORD'/>
-        </IndexedFaceSet>
-      </Shape>
       <Shape>
         <Appearance>
           <Material USE='Def23'/>