collision detection side and under
merge with movement
Merged with Movement, IPCH needs to be fixed
merge for demo
demo
demo
Demo
Commit for carlo
added gitignore
Made Mario Big-Textures
Collision fixed
Merged Conflicts
Fixed merging
Collision bug fixed, and collision break included
Added specialblock
Added textureChanging specialblock
Added movement and improved jumping
Merge conflicts
merged master into project