Player enters jumping state when on bouncer
Player shows death state when dead in liquid/lava
Reset player x velocity when they freeze

When a dialog opens, reset player x velocity so they don't continue running after exiting dialog. Also allow the player to continue falling if they opened a dialog in mid-air.
Align zippy sprite to base and match dimensions
Merge pull request #2241 from niamu/zippy_fix

Align zippy sprite to base and match dimensions
Merge pull request #2240 from niamu/player_dialog_velocity

Reset player x velocity when they freeze
Merge pull request #2228 from niamu/player_animations

Player animation fixes
Remove obsolete gameover.lua
Create player die function

Make sure that we close the inventory and other dialogs/prompts on player death.
Remove dialogs and prompts on player death

This should never, ever happen, but it's good to be safe.
Remove the last remains of smart spawntype
Merge pull request #21 from niamu/tile_collisions

Chest spawn animation
new collisions: fix to baseball, snowmen, moving platforms
Don't interpret any keypresses if player is dead
Merge pull request #2244 from niamu/player_death

Player death fixes
Merge pull request #2245 from niamu/remove_smart_spawn

Remove the last remains of smart spawntype
new collisions: baseball tweak
Merge remote-tracking branch 'upstream/master' into tile_collisions

Conflicts:
	src/nodes/spawn.lua
new collisions: falling acorns fix
Fix player states in dialog and chest spawns