Commit Graph

184 Commits

Author SHA1 Message Date
Ruben Müller 64b78fb9eb Cursor gone 2014-12-07 18:14:12 +01:00
Ruben Müller 183e27d220 Cursor! 2014-12-07 18:12:47 +01:00
Ruben Müller 9388487309 Update notes 2014-12-07 18:09:08 +01:00
Ruben Müller 519a5f4b21 Awesome buildinfo 2014-12-07 18:08:30 +01:00
Ruben Müller 0427129db5 Add all bubbles 2014-12-07 18:03:46 +01:00
Jonas1989 243645658c Merge remote-tracking branch 'origin/master' 2014-12-07 18:01:03 +01:00
Jonas1989 941257a063 add intro and end screens 2014-12-07 18:00:55 +01:00
Ruben Müller 7cb6e07602 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-07 17:57:41 +01:00
Ruben Müller a6e905d57a Yay release 2014-12-07 17:57:33 +01:00
Jonas1989 db62c5d9a2 Merge remote-tracking branch 'origin/master' 2014-12-07 17:57:24 +01:00
Jonas1989 64766f0d88 add intro and end screens 2014-12-07 17:57:17 +01:00
Aaron Mueller 280b293fb7 small fixes after merge 2014-12-07 17:56:52 +01:00
Aaron Mueller 89bc084f43 solarpanel 2014-12-07 17:54:51 +01:00
Ruben Müller 8c66cb2901 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-07 17:41:26 +01:00
Ruben Müller de01da9f81 Ntoes and HUD 2014-12-07 17:41:21 +01:00
Ruben Müller 9a6ef0c994 Speechbubble says more 2014-12-07 17:31:30 +01:00
Jonas1989 49c18fbb6b add intro 2014-12-07 17:27:32 +01:00
Ruben Müller 9dcef3b43e Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-07 17:22:06 +01:00
Ruben Müller f02df022d3 Add infobox 2014-12-07 17:21:58 +01:00
Aaron Mueller 227f20d1be hud polishing 2014-12-07 17:21:39 +01:00
Ruben Müller dc46a06ee0 GFX 2014-12-07 17:10:22 +01:00
Ruben Müller cecb52a963 Merge branch 'master' of https://github.com/arg-games/ld31
Conflicts:
	public/images/entities.png
2014-12-07 17:09:14 +01:00
Ruben Müller 78c245d3e1 HUD update 2014-12-07 17:08:31 +01:00
Ruben Müller 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 b510790ef8 can't click on dead tiles 2014-12-07 16:28:06 +01:00
Aaron Mueller 656547aacd GFX polishing 2014-12-07 16:28:06 +01:00
Ruben Müller b7f5bff2f1 More space for the main base 2014-12-07 16:17:10 +01:00
Ruben Müller ca2ec250d6 New notes 2014-12-07 16:16:55 +01:00
Ruben Müller 19941d4ac8 Merge branch 'master' of https://github.com/arg-games/ld31
Conflicts:
	src/app.coffee
2014-12-07 15:53:47 +01:00
Ruben Müller 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
Jonas1989 82e5a55d24 add actions 2014-12-07 15:37:13 +01:00
Jonas1989 4d1313fccc add layers-details 2014-12-07 15:33:53 +01:00
Ruben Müller e26acf2c2e Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-07 15:21:01 +01:00
Ruben Müller 062da58745 Updates notes.org 2014-12-07 15:20:45 +01:00
Jonas1989 4a833902cc addlayers-details 2014-12-07 15:18:48 +01:00
Ruben Müller abb1d3c3da Colored capacity panel 2014-12-07 15:13:19 +01:00
Ruben Müller dcf7d78ff9 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-07 14:45:27 +01:00
Ruben Müller c62cc69d15 Added animations 2014-12-07 14:45:13 +01:00
Jonas1989 0bc344464d add actions 2014-12-07 14:35:53 +01:00
Jonas1989 74cd1bdf4c add actions 2014-12-07 14:27:56 +01:00
Aaron Mueller 7be346aaaa notes edit 2014-12-07 14:19:00 +01:00
Aaron Mueller d8cfae7940 Entity constraints 2014-12-07 14:13:04 +01:00
Jonas1989 dfbcb1598c add actions 2014-12-07 14:10:53 +01:00
Ruben Müller 09fce2c34b Rename effects 2014-12-07 14:04:04 +01:00
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
Jonas1989 c1c01eea79 add effects 2014-12-07 14:02:44 +01:00
Ruben Müller 29ebab4b46 Working on HUD anim 2014-12-07 14:02:42 +01:00
Jonas1989 148ea3d9b4 Merge remote-tracking branch 'origin/master' 2014-12-07 14:00:22 +01:00