]> code.bitgloo.com Git - clyne/gamedev.git/commitdiff
Player Sprite
authordrumsetmonkey <abelleisle@roadrunner.com>
Thu, 21 Jan 2016 14:09:52 +0000 (09:09 -0500)
committerdrumsetmonkey <abelleisle@roadrunner.com>
Thu, 21 Jan 2016 14:09:52 +0000 (09:09 -0500)
1  2 
assets/playerk.png
include/common.h
include/entities.h
main.cpp
src/entities.cpp
xcf/playerk.xcf

index 3dfb4ddf012a0d6d824d79af4e6250d9ab0e9ace,be98f97491f96a2a5d47e1923623394589918101..3f5539227b0f8795ef989d78f4c3487a4793ff77
Binary files differ
Simple merge
Simple merge
diff --cc main.cpp
Simple merge
Simple merge
diff --cc xcf/playerk.xcf
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..697edaed7e28c0bd55ff13054afe1bc0d185e76e
new file mode 100644 (file)
Binary files differ