readded readme, fixed world handling w/ interpolation

author Clyne Sullivan <tullivan99@gmail.com>

Tue, 29 Sep 2015 12:09:46 +0000 (08:09 -0400)

committer Clyne Sullivan <tullivan99@gmail.com>

Tue, 29 Sep 2015 12:09:46 +0000 (08:09 -0400)
author Clyne Sullivan <tullivan99@gmail.com>
Tue, 29 Sep 2015 12:09:46 +0000 (08:09 -0400)
committer Clyne Sullivan <tullivan99@gmail.com>
Tue, 29 Sep 2015 12:09:46 +0000 (08:09 -0400)
diff --cc include/common.h
Simple merge
diff --cc src/entities.cpp
Simple merge
diff --cc src/main.cpp
Simple merge
diff --cc src/ui.cpp
Simple merge
author	Clyne Sullivan <tullivan99@gmail.com>
	Tue, 29 Sep 2015 12:09:46 +0000 (08:09 -0400)
committer	Clyne Sullivan <tullivan99@gmail.com>
	Tue, 29 Sep 2015 12:09:46 +0000 (08:09 -0400)
		1	2
include/common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/entities.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui.cpp	patch \|	diff1 \|	diff2 \|	blob \| history