Merge branch 'master' of github.com:BehaviorTree/BehaviorTree.CPP

facontidavide · facontidavide · commit d597a6a1ff35 · 2019-10-30T18:40:12.000+01:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -2,8 +2,8 @@ clone_depth: 5
 
 environment:
   matrix:
-#   - GENERATOR : "MinGW Makefiles"
-#      PLATFORM: x86
+    - GENERATOR : "MinGW Makefiles"
+      PLATFORM: x86
     - GENERATOR : "Visual Studio 15 2017 Win64"
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PLATFORM: x64
@@ -15,11 +15,10 @@ configuration:
 install:
   - set PATH=C:\MinGW\bin;C:\MinGW\msys\1.0;%PATH%
 
-
 before_build:
   - mkdir build
   - cd build
-  - cmake "-G%GENERATOR%" ..
+  - cmake "-G%GENERATOR%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin" ..
 
 build_script:
 - cmake --build .
diff --git a/docs/FallbackNode.md b/docs/FallbackNode.md
@@ -98,7 +98,6 @@ if he/she is fully rested.
 				// Suspend execution and return SUCCESS.
 				// At the next tick, index will be the same.
    			    HaltAllChildren();
-				index = 0;
 				return SUCCESS;
 			}
 		}
diff --git a/docs/tutorial_07_legacy.md b/docs/tutorial_07_legacy.md
@@ -70,7 +70,7 @@ int main()
     auto MoveToWrapperWithLambda = [&move_to](TreeNode& parent_node) -> NodeStatus
     {
         Point3D goal;
-        // thanks to paren_node, you can access easily the inpyt and output ports.
+        // thanks to paren_node, you can access easily the input and output ports.
         parent_node.getInput("goal", goal);
 
         bool res = move_to.go( goal );
diff --git a/docs/tutorial_08_additional_args.md b/docs/tutorial_08_additional_args.md
@@ -16,7 +16,7 @@ We will just use the word _"parameter"_ for the rest of the tutorial.
 Even if, theoretically, these parameters can be passed using Input Ports, 
 that would be the wrong way to do it if:
 
-- The parameters are know at _deployment-time_.
+- The parameters are known at _deployment-time_.
 - The parameters don't change at _run-time_.
 - The parameters don't need to be from the _XML_.
 
diff --git a/examples/t07_wrap_legacy.cpp b/examples/t07_wrap_legacy.cpp
@@ -67,7 +67,7 @@ int main()
     auto MoveToWrapperWithLambda = [&move_to](TreeNode& parent_node) -> NodeStatus
     {
         Point3D goal;
-        // thanks to paren_node, you can access easily the inpyt and output ports.
+        // thanks to paren_node, you can access easily the input and output ports.
         parent_node.getInput("goal", goal);
 
         bool res = move_to.go( goal );

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ if he/she is fully rested.`
`98`	`98`	`// Suspend execution and return SUCCESS.`
`99`	`99`	`// At the next tick, index will be the same.`
`100`	`100`	`HaltAllChildren();`
`101`		`- index = 0;`
`102`	`101`	`return SUCCESS;`
`103`	`102`	`}`
`104`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ int main()`
`70`	`70`	`auto MoveToWrapperWithLambda = [&move_to](TreeNode& parent_node) -> NodeStatus`
`71`	`71`	`{`
`72`	`72`	`Point3D goal;`
`73`		`- // thanks to paren_node, you can access easily the inpyt and output ports.`
	`73`	`+ // thanks to paren_node, you can access easily the input and output ports.`
`74`	`74`	`parent_node.getInput("goal", goal);`
`75`	`75`
`76`	`76`	`bool res = move_to.go( goal );`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ int main()`
`67`	`67`	`auto MoveToWrapperWithLambda = [&move_to](TreeNode& parent_node) -> NodeStatus`
`68`	`68`	`{`
`69`	`69`	`Point3D goal;`
`70`		`- // thanks to paren_node, you can access easily the inpyt and output ports.`
	`70`	`+ // thanks to paren_node, you can access easily the input and output ports.`
`71`	`71`	`parent_node.getInput("goal", goal);`
`72`	`72`
`73`	`73`	`bool res = move_to.go( goal );`