Ruben Müller 5ede943f03 Merge branch 'master' of https://github.com/arg-games/ld31 ... Conflicts: public/images/Effects.png		2014-12-07 14:03:39 +01:00
..
actions.png	Working on HUD anim	2014-12-07 14:02:42 +01:00
active.png	Update the active tile indicator	2014-12-06 16:37:00 +01:00
Effects.png	add effects	2014-12-07 14:02:44 +01:00
entities.png	add entities and layers	2014-12-07 13:23:02 +01:00
hud.png	add entities	2014-12-06 23:47:45 +01:00
layers.png	add layers	2014-12-07 14:00:15 +01:00
progress.png	+silos, polishing, gfx	2014-12-07 00:20:55 +01:00
selected.png	HUD stuff	2014-12-07 01:08:39 +01:00
Thumbs.db	add effects	2014-12-07 14:02:44 +01:00