Merge branch 'master' of https://gitlab.nps.edu/Savage/Savage

8e70feb8 · Brutzman, Don · d23549f6 · e16a3e17 · 8e70feb8 · 8e70feb8
Commit 8e70feb8 authored 5 years ago by Brutzman, Don
--- a/ShipsCivilian/CargoShips/ContainerShip.x3d
+++ b/ShipsCivilian/CargoShips/ContainerShip.x3d
@@ -8,13 +8,15 @@
    <meta content='LT Patrick Sullivan' name='translator'/>
    <meta content='23 March 2005' name='created'/>
    <meta content='30 January 2006' name='translated'/>
-    <meta content='20 October 2019' name='modified'/>
+    <meta content='1 December 2019' name='modified'/>
+    <meta content='ContainerShipFromAbove.png' name='Image'/>
    <meta content='https://savage.nps.edu/Savage/ShipsCivilian/CargoShips/ContainerShip.x3d' name='identifier'/>
    <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/>
    <meta content='VizX3D, http://www.vivaty.com/downloads/studio' name='generator'/>
    <meta content='../../license.html' name='license'/>
  </head>
  <Scene>
+    <Background skyColor='0 0.717647 0.741176'/>
    <WorldInfo info='"www.vizx3d.com" "http://www.ship-technology.com/projects/contship/specs.html"' title='Container Ship'>
      <MetadataSet name='SMAL' reference='https://savage.nps.edu/Savage/Tools/SMAL/SMAL.html'>
        <MetadataString containerField='value' name='version' value='"1.0"'>

--- a/ShipsCivilian/CargoShips/ContainerShipFromAbove.png
+++ b/ShipsCivilian/CargoShips/ContainerShipFromAbove.png
--- a/developers.html
+++ b/developers.html
--- a/license.html
+++ b/license.html
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
    <head>
        <title>Open-Source Software License for NPS MOVES Savage Research Group</title>
        <meta name="description" content="Open-Source Software License for NPS MOVES Savage Research Group.
-              This BSD-style license is non-viral and friendly to academia, government, industry, and individuals." />
-        <meta name="author" content="Donald P. Brutzman" />
-        <meta name="created" content="4 March 2005" />
-        <meta name="revised" content="5 August 2019" />
-        <meta name="identifier" content="https://savage.nps.edu/Savage/license.html" />
-        <meta name="identifier" content="https://savage.nps.edu/Savage/license.txt" />
-        <meta name="identifier" content="https://handle.dtic.mil/100.2/ADA450769" />
-        <meta name="reference" content="https://www.oreilly.com/catalog/osfreesoft" />
-        <meta name="reference" content="https://opensource.org/licenses/bsd-license.php" />
-        <meta name="reference" content="https://xchat.movesinstitute.org/bugzilla/show_bug.cgi?id=32" />
+              This BSD-style license is non-viral and friendly to academia, government, industry, and individuals."/>
+        <meta name="author" content="Donald P. Brutzman"/>
+        <meta name="created" content="4 March 2005"/>
+		<meta name="modified" content="1 January 2020"/>
+        <meta name="identifier" content="https://savage.nps.edu/Savage/license.html"/>
+        <meta name="reference"  content="https://savage.nps.edu/Savage/license.txt"/>
+        <meta name="reference" content="https://www.web3d.org/specifications/license.html"/>
+        <meta name="reference" content="https://www.web3d.org/specifications/license.txt"/>
+        <meta name="reference" content="https://handle.dtic.mil/100.2/ADA450769"/>
+        <meta name="reference" content="https://www.oreilly.com/catalog/osfreesoft"/>
+        <meta name="reference" content="https://opensource.org/licenses/bsd-license.php"/>
        <link rel="icon" href="https://www.web3D.org/x3d/content/examples/images/X3DtextIcon16.png" title="X3D" type="image/png"/>
    </head>
    <body>
-        <p>Copyright (c) 1995-2019 held by the author(s).  All rights reserved.</p>
+        <p>Copyright (c) 1995-2020 held by the author(s).  All rights reserved.</p>

        <p>
            Redistribution and use in source and binary forms, with or without
@@ -38,7 +39,7 @@
            <li>
                Neither the names of the
                <a href="https://www.nps.edu">Naval Postgraduate School (NPS)</a>
-                <a href="https://www.MovesInstitute.org">Modeling Virtual Environments and Simulation (MOVES) Institute</a>
+                <a href="https://my.nps.edu/web/moves">Modeling Virtual Environments and Simulation (MOVES) Institute</a>
                nor the names of its contributors may be used to endorse or
                promote products derived from this software without specific
                prior written permission.

--- a/license.txt
+++ b/license.txt
-Copyright (c) 1995-2019 held by the author(s).  All rights reserved.
+Copyright (c) 1995-2020 held by the author(s).  All rights reserved.

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@ are met:
      distribution.
    * Neither the names of the Naval Postgraduate School (NPS)
      Modeling Virtual Environments and Simulation (MOVES) Institute
-      (https://www.nps.edu and https://www.MovesInstitute.org)
+      (https://www.nps.edu and https://my.nps.edu/web/moves)
      nor the names of its contributors may be used to endorse or
      promote products derived from this software without specific
      prior written permission.