Merge branch 'master' into issue437

This commit is contained in:
Grey-Echo
2017-04-22 15:21:43 +02:00
23 changed files with 1056 additions and 240 deletions

View File

@@ -95,7 +95,7 @@
<div id="content">
<h1>Module <code>Cargo</code></h1>
<p><strong>Core</strong> -- Management of CARGO logistics, that can be transported from and to transportation carriers.</p>
<p><strong>(R2.1) Core</strong> -- Management of CARGO logistics, that can be transported from and to transportation carriers.</p>
@@ -136,7 +136,7 @@
<tr>
<td class="name" nowrap="nowrap"><a href="#CARGO">CARGO</a></td>
<td class="summary">
<h1>CARGO class, extends <a href="Fsm.html##(FSM_PROCESS)">Fsm#FSM_PROCESS</a></h1>
<h1>(R2.1) CARGO class, extends <a href="Fsm.html##(FSM_PROCESS)">Fsm#FSM_PROCESS</a></h1>
<p>The CARGO class defines the core functions that defines a cargo object within MOOSE.</p>
</td>
@@ -217,7 +217,7 @@
<tr>
<td class="name" nowrap="nowrap"><a href="##(CARGO).GetName">CARGO:GetName()</a></td>
<td class="summary">
<p>Get the name of the Cargo.</p>
<p>(R2.1) Get the name of the Cargo.</p>
</td>
</tr>
<tr>
@@ -283,7 +283,7 @@
<tr>
<td class="name" nowrap="nowrap"><a href="##(CARGO).New">CARGO:New(Type, Name, Weight, NearRadius)</a></td>
<td class="summary">
<p>CARGO Constructor.</p>
<p>(R2.1) CARGO Constructor.</p>
</td>
</tr>
<tr>
@@ -721,7 +721,7 @@
</dt>
<dd>
<h1>CARGO class, extends <a href="Fsm.html##(FSM_PROCESS)">Fsm#FSM_PROCESS</a></h1>
<h1>(R2.1) CARGO class, extends <a href="Fsm.html##(FSM_PROCESS)">Fsm#FSM_PROCESS</a></h1>
<p>The CARGO class defines the core functions that defines a cargo object within MOOSE.</p>
@@ -970,7 +970,7 @@ The radius when the cargo will board the Carrier (to avoid collision).</p>
</dt>
<dd>
<p>Get the name of the Cargo.</p>
<p>(R2.1) Get the name of the Cargo.</p>
<h3>Return value</h3>
@@ -1186,7 +1186,7 @@ The Carrier that will hold the cargo.</p>
</dt>
<dd>
<p>CARGO Constructor.</p>
<p>(R2.1) CARGO Constructor.</p>
<p>This class is an abstract class and should not be instantiated.</p>