Merge branch 'master-ammr-2.5' into no-leg-improvements

.gitattributes

@@ -1,4 +1,38 @@
 * text=auto
+
+# AnyBody files
+# ============
+*.any text
+*.anysurf3 binary
+*.anysurf4 binary
+
+*.md linguist-detectable
+
+# Source files
+# ============
+*.pxd    text diff=python
+*.py     text diff=python
+*.py3    text diff=python
+*.pyw    text diff=python
+*.pyx    text diff=python
+*.pyz    text diff=python
+*.pyi    text diff=python
+
+# Binary files
+# ============
+*.db     binary
+*.p      binary
+*.pkl    binary
+*.pickle binary
+*.pyc    binary export-ignore
+*.pyo    binary export-ignore
+*.pyd    binary
+
+# Jupyter notebook
+*.ipynb  text eol=lf
+
+
+# Export ignored files files
 .gitattributes export-ignore  
 .gitignore export-ignore
 .gitkeep export-ignore

Application/Beta/AAUCow/AAUCow.main.any

@@ -1,51 +1,51 @@
-#include "../libdef.any"
-
-Main = {
-  #include "Model/RunApplication.any"
-  
-
-  
-  // The actual body model goes in this folder
-  AnyFolder Forelimb = {
-    
-    // Global Reference Frame
-    AnyFixedRefFrame GlobalRef = {
-      AnyDrawRefFrame DrwGlobalRef = {
-      ScaleXYZ = {0.25, 0.25, 0.25};
-      };
-      
-      AnyRefNode HangNode = {
-        sRel = {0.5,0.5,0.5};      
-      };
-      
-//      AnyDrawNodes RefNodes = {
-//        ScaleXYZ={0.015,0.015,0.015};
-//        RGB={1.0,1.0,0.0};
-//      };
-
-      // Todo: Add points for grounding of the model here
-      
-    }; // Global reference frame
-
-    #include "<ANYBODY_PATH_BODY>/../Beta/AAUCow/Environment.any"
-    #include "<ANYBODY_PATH_BODY>/../Beta/AAUCow/Segments.any"  
-    #include "<ANYBODY_PATH_BODY>/../Beta/AAUCow/Joints.any"    
-    #include "<ANYBODY_PATH_BODY>/../Beta/AAUCow/Muscles.any"    
-    #include "<ANYBODY_PATH_BODY>/../Beta/AAUCow/MotionTracker.any"
-    #include "Model/InitialPositions.any"
-
-  }; // Forelimb
-  
-  // The study: Operations to be performed on the model
-  AnyBodyStudy Study = {
-    
-    AnyFolder &Model = .Forelimb;
-    Gravity = {0.0, 0.0, -9.81};
-    tStart = 0;
-    tEnd = 1.12; 
-    nStep = 122;
-  
-  };
-  
-  
+#include "../libdef.any"
+
+Main = {
+  #include "Model/RunApplication.any"
+
+
+
+  // The actual body model goes in this folder
+  AnyFolder Forelimb = {
+
+    // Global Reference Frame
+    AnyFixedRefFrame GlobalRef = {
+      AnyDrawRefFrame DrwGlobalRef = {
+      ScaleXYZ = {0.25, 0.25, 0.25};
+      };
+
+      AnyRefNode HangNode = {
+        sRel = {0.5,0.5,0.5};      
+      };
+
+//      AnyDrawNodes RefNodes = {
+//        ScaleXYZ={0.015,0.015,0.015};
+//        RGB={1.0,1.0,0.0};
+//      };
+
+      // Todo: Add points for grounding of the model here
+
+    }; // Global reference frame
+
+    #include "<ANYBODY_PATH_BODY>/../Beta/AAUCow/Environment.any"
+    #include "<ANYBODY_PATH_BODY>/../Beta/AAUCow/Segments.any"  
+    #include "<ANYBODY_PATH_BODY>/../Beta/AAUCow/Joints.any"    
+    #include "<ANYBODY_PATH_BODY>/../Beta/AAUCow/Muscles.any"    
+    #include "<ANYBODY_PATH_BODY>/../Beta/AAUCow/MotionTracker.any"
+    #include "Model/InitialPositions.any"
+
+  }; // Forelimb
+
+  // The study: Operations to be performed on the model
+  AnyBodyStudy Study = {
+
+    AnyFolder &Model = .Forelimb;
+    Gravity = {0.0, 0.0, -9.81};
+    tStart = 0;
+    tEnd = 1.12; 
+    nStep = 122;
+
+  };
+
+
 };  // Main