Commit graph

79 commits

Author SHA1 Message Date
68838fa3c9 Merge branch 'master' of https://github.com/arg-games/ld31
Conflicts:
	src/app.coffee
2014-12-07 18:54:11 +01:00
c98464bec0 Info button 2014-12-07 18:53:30 +01:00
a20bfd6dab add titlescreen 2014-12-07 18:45:27 +01:00
3a506cc908 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-07 18:41:43 +01:00
4a2ee93577 Speech 2014-12-07 18:41:33 +01:00
Aaron Mueller
0bcc7acd20 energy and game end check 2014-12-07 18:37:18 +01:00
48ee574185 add intro, endcreens and layer-details 2014-12-07 18:32:59 +01:00
183e27d220 Cursor! 2014-12-07 18:12:47 +01:00
519a5f4b21 Awesome buildinfo 2014-12-07 18:08:30 +01:00
243645658c Merge remote-tracking branch 'origin/master' 2014-12-07 18:01:03 +01:00
941257a063 add intro and end screens 2014-12-07 18:00:55 +01:00
7cb6e07602 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-07 17:57:41 +01:00
a6e905d57a Yay release 2014-12-07 17:57:33 +01:00
db62c5d9a2 Merge remote-tracking branch 'origin/master' 2014-12-07 17:57:24 +01:00
64766f0d88 add intro and end screens 2014-12-07 17:57:17 +01:00
Aaron Mueller
89bc084f43 solarpanel 2014-12-07 17:54:51 +01:00
8c66cb2901 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-07 17:41:26 +01:00
de01da9f81 Ntoes and HUD 2014-12-07 17:41:21 +01:00
9a6ef0c994 Speechbubble says more 2014-12-07 17:31:30 +01:00
49c18fbb6b add intro 2014-12-07 17:27:32 +01:00
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