for testing probe animation
Merge branch 'develop' of https://github.com/haroniti/NinjaCoders125 into develop
stash
stash2
merge
Merge branch 'develop' of https://github.com/haroniti/NinjaCoders125 into develop
floating crates!
Tentacle Changes

To adjust it
Merging
Slam Base and Middle

these two are good for doing the slam on the south wall, but not the
transition back
tip smashes

now to make the duration good for both attack and combo
fixing mistake

had commented out a lot of the positions for the tentacles.
Slam on south wall works!

Assumes that Cycle is still 18, since the slam animation cycle is 20
Slam Done!

Next: calculate the actual player angle
Merged
There was an unresolved conflict
Merged with develop
All heightmaps operational.  New jump code/gravity code added
Merge branch 'develop' into develop_aabb