code.bitgloo.com Git - clyne/gamedev.git/commit

]> code.bitgloo.com Git - clyne/gamedev.git/commit

projects / clyne / gamedev.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c35571e a9a9777)

author	drumsetmonkey <abelleisle@roadrunner.com>
	Wed, 30 Mar 2016 12:47:31 +0000 (08:47 -0400)
committer	drumsetmonkey <abelleisle@roadrunner.com>
	Wed, 30 Mar 2016 12:47:31 +0000 (08:47 -0400)
commit	0b1bfa28f33410acc1c3b95df1c1b748ce55b447
tree	807e942cfb92cb631b02ec0079da63838dd6741f	tree \| snapshot
parent	c35571e37bdd6d2fe9b95e4265c150265585f3a9	commit \| diff
parent	a9a9777190086bd2ce2aa54e20a1101509614463	commit \| diff

Inv and textures

12 files changed:

include/common.hpp	diff1 \|	\|	blob \| history
include/config.hpp	diff1 \|	\|	blob \| history
include/inventory.hpp	diff1 \|	\|	blob \| history
include/world.hpp	diff1 \|	\|	blob \| history
main.cpp	diff1 \|	diff2 \|	blob \| history
src/config.cpp	diff1 \|	diff2 \|	blob \| history
src/inventory.cpp	diff1 \|	diff2 \|	blob \| history
src/quest.cpp	\|	diff2 \|	blob \| history
src/texture.cpp	\|	diff2 \|	blob \| history
src/ui.cpp	diff1 \|	diff2 \|	blob \| history
src/world.cpp	diff1 \|	diff2 \|	blob \| history
xml/playerSpawnHill1_Building1.xml	diff1 \|	diff2 \|	blob \| history

A 2D video game project