Merge branch 'master' of https://github.com/tcsullivan/gamedev2 into audio

author Clyne Sullivan <clyne@bitgloo.com>

Wed, 2 Oct 2019 00:50:41 +0000 (20:50 -0400)

committer Clyne Sullivan <clyne@bitgloo.com>

Wed, 2 Oct 2019 00:50:41 +0000 (20:50 -0400)
author Clyne Sullivan <clyne@bitgloo.com>
Wed, 2 Oct 2019 00:50:41 +0000 (20:50 -0400)
committer Clyne Sullivan <clyne@bitgloo.com>
Wed, 2 Oct 2019 00:50:41 +0000 (20:50 -0400)
diff --cc src/engine.cpp
Simple merge
diff --cc src/script.cpp
Simple merge
author	Clyne Sullivan <clyne@bitgloo.com>
	Wed, 2 Oct 2019 00:50:41 +0000 (20:50 -0400)
committer	Clyne Sullivan <clyne@bitgloo.com>
	Wed, 2 Oct 2019 00:50:41 +0000 (20:50 -0400)
		1	2
src/engine.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/script.cpp	patch \|	diff1 \|	diff2 \|	blob \| history