Copy stdout and stderr to HUD
Add missing file
Fix linux build
cleanup
Add missing file
rename to HUD::printLine()
add prop_lineTime
Add smoothness algorithm
Formatting
Merge branch 'master' into voxel-stdout

Conflicts:
	src/game.h
Merge pull request #248 from voxelinc/voxel-stdout

Copy stdout and stderr to HUD
fix whitespace
remove auto, rename sp
fix whitespace in main
fix voxelmesh indentation
shader {
Merge branch 'master' of https://github.com/voxelinc/voxellancer into switch_voxelcluster_to_vaos

Conflicts:
	src/game.h
fix merge error
Merge pull request #265 from voxelinc/switch_voxelcluster_to_vaos

Switch voxelcluster to vaos
Merge branch 'master' of https://github.com/voxelinc/voxellancer into add_emissivness

Conflicts:
	data/particle.vert
	data/voxelcluster.vert