Commit graph

66 commits

Author SHA1 Message Date
Aaron Mueller
227f20d1be hud polishing 2014-12-07 17:21:39 +01:00
dc46a06ee0 GFX 2014-12-07 17:10:22 +01:00
cecb52a963 Merge branch 'master' of https://github.com/arg-games/ld31
Conflicts:
	public/images/entities.png
2014-12-07 17:09:14 +01:00
8e3d344255 Update asssets 2014-12-07 17:08:09 +01:00
Aaron Mueller
270014db3d detail entities 2014-12-07 17:04:40 +01:00
Aaron Mueller
656547aacd GFX polishing 2014-12-07 16:28:06 +01:00
19941d4ac8 Merge branch 'master' of https://github.com/arg-games/ld31
Conflicts:
	src/app.coffee
2014-12-07 15:53:47 +01:00
6f482e8d2c Speechbubble work 2014-12-07 15:52:54 +01:00
Aaron Mueller
30f72a3135 Pimp the GFX and make dead tiles 2014-12-07 15:48:45 +01:00
82e5a55d24 add actions 2014-12-07 15:37:13 +01:00
4d1313fccc add layers-details 2014-12-07 15:33:53 +01:00
4a833902cc addlayers-details 2014-12-07 15:18:48 +01:00
0bc344464d add actions 2014-12-07 14:35:53 +01:00
74cd1bdf4c add actions 2014-12-07 14:27:56 +01:00
dfbcb1598c add actions 2014-12-07 14:10:53 +01:00
09fce2c34b Rename effects 2014-12-07 14:04:04 +01:00
5ede943f03 Merge branch 'master' of https://github.com/arg-games/ld31
Conflicts:
	public/images/Effects.png
2014-12-07 14:03:39 +01:00
c1c01eea79 add effects 2014-12-07 14:02:44 +01:00
29ebab4b46 Working on HUD anim 2014-12-07 14:02:42 +01:00
f87de6febc add layers 2014-12-07 14:00:15 +01:00
0a71cdbc49 Renamed asset 2014-12-07 13:48:44 +01:00
45598381db add effects 2014-12-07 13:47:18 +01:00
b7df9c356c add effects 2014-12-07 13:42:16 +01:00
0dc491909a add entities and layers 2014-12-07 13:23:02 +01:00
b58dcd0f84 add layers 2014-12-07 13:17:50 +01:00
b3b525bb22 add entities 2014-12-07 13:10:21 +01:00
834239d184 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-07 01:09:01 +01:00
d266258052 HUD stuff 2014-12-07 01:08:39 +01:00
37fbf37f6c Merge remote-tracking branch 'origin/master' 2014-12-07 00:58:34 +01:00
5a3fa051ad Add some soundfiles 2014-12-07 00:58:23 +01:00
Aaron Mueller
602d01a95e image fix 2014-12-07 00:23:55 +01:00
Aaron Mueller
dbea27ca39 +silos, polishing, gfx 2014-12-07 00:20:55 +01:00
599c7ae455 add entities 2014-12-06 23:47:45 +01:00
bd46e22b28 add entities 2014-12-06 21:53:35 +01:00
3a4d5e37eb add entities 2014-12-06 21:49:33 +01:00
903949c306 add hud 2014-12-06 21:32:44 +01:00
92407f6a84 add hud 2014-12-06 21:27:16 +01:00
0f777df0b0 add hud 2014-12-06 21:24:17 +01:00
8132294369 Merge remote-tracking branch 'origin/master'
Conflicts:
	public/images/layers.png
2014-12-06 21:12:06 +01:00
7e6b190f0d add layers and entities 2014-12-06 21:09:43 +01:00
7056bbc622 Fix 2014-12-06 21:08:46 +01:00
2a865bb72e add hud 2014-12-06 20:54:37 +01:00
fd2005cdf8 add hud 2014-12-06 20:52:31 +01:00
6e79b095e1 add entities 2014-12-06 20:50:08 +01:00
bdf9abc14f add entities 2014-12-06 19:59:56 +01:00
Aaron Mueller
ecfa9d7268 hud work 2014-12-06 19:02:34 +01:00
48b3b624a0 add entities 2014-12-06 18:58:17 +01:00
0029492f18 add entities 2014-12-06 17:57:29 +01:00
ccfee4c958 Add HUD 2014-12-06 17:30:15 +01:00
1b247d796b add entities 2014-12-06 17:10:58 +01:00