data changes

assets/Data/entity/creatures/human.json

@@ -514,8 +514,8 @@
                     "hitstun" : 7,
                     "attackState" : {
                         "animation" : {
-                            "nameFirstPerson" : "SwordR2HSlash",
+                            "nameFirstPerson" : "SwordR2HSlash1",
-                            "nameThirdPerson" : "SwordR2HSlash",
+                            "nameThirdPerson" : "SwordR2HSlash1",
                             "priorityCategory"  : "MOVEMENT_MODIFIER",
                             "boneGroups" : ["armLeft", "armRight", "handLeft", "handRight"]
                         },

assets/Data/entity/foliage.json

@@ -189,6 +189,22 @@
                     "radius": 0.175
                 }
             ],
+            "collidable" : {
+                "type" : "CYLINDER",
+                "dimension1" : 0.2,
+                "dimension2" : 1.6,
+                "dimension3" : 0.2,
+                "linearFriction": 0.001,
+                "mass": 0.3,
+                "rotX": 0,
+                "rotY": 0,
+                "rotZ": 0,
+                "rotW": 1,
+                "offsetX" : 0,
+                "offsetY" : 0.8,
+                "offsetZ" : 0,
+                "kinematic" : true
+            },
             "healthSystem" : {
                 "maxHealth" : 50,
                 "onDamageIFrames" : 5,

docs/src/progress/renderertodo.md

@@ -1138,6 +1138,8 @@ Dedicated control for opening crafting
 Break out network imgui debug window
 Move text files to documentation pages
 1000th commit milestone!
+Pine tree collidables
+Fix human animation bad data
 
 
 # TODO