Merge branch 'master' of luffa:git/cosmos

2013-11-24 21:10:44 +01:00 · 2013-11-24 21:10:44 +01:00 · 72154b8c62
commit 72154b8c62
parent b44e1f3bee 15817602b2
4 changed files with 7 additions and 1 deletions
--- a/6
+++ b/6
@ -0,0 +1,6 @@
+all: data/sprites.json
+
+data/sprites.json: asset/
+	spriter asset/
+	mv sprites.json data/
+	mv sprites.png images/
--- a/asset/minecraft-cake01.png
+++ b/asset/minecraft-cake01.png
--- a/data/sprites.json
+++ b/data/sprites.json
@ -1 +1 @@
-{"astronaut":{"sx":0,"sy":1,"cols":1,"tilew":24,"tileh":24,"frames":1},"neingeist":{"sx":0,"sy":26,"cols":1,"tilew":24,"tileh":24,"frames":1},"starbug":{"sx":0,"sy":51,"cols":1,"tilew":24,"tileh":24,"frames":1}}
+{"astronaut":{"sx":0,"sy":1,"cols":1,"tilew":24,"tileh":24,"frames":1},"minecraft-cake":{"sx":0,"sy":26,"cols":1,"tilew":32,"tileh":32,"frames":1},"neingeist":{"sx":0,"sy":59,"cols":1,"tilew":24,"tileh":24,"frames":1},"starbug":{"sx":0,"sy":84,"cols":1,"tilew":24,"tileh":24,"frames":1}}
--- a/images/sprites.png
+++ b/images/sprites.png