new player movement full of bugs
added buggy collision detection / resolution
added temporary earthquakes
Fixed all collision bugs.. earthquake is no more :'(
added a bit of combat stuff i think..
changed power of npc pushback
added disable mechanic to player, fixed tearing issue
Merged experimental_combat_branch into master