Commit Graph

107 Commits

Author SHA1 Message Date
Ruben Müller 4a0278e90c Fixed some bugs, made gameplay better 2014-12-07 20:48:54 +01:00
Ruben Müller 95735090d5 Fix item cost 2014-12-07 19:41:22 +01:00
Aaron Mueller 279ba72323 bug fixed 2014-12-07 19:14:40 +01:00
Aaron Mueller c8aedab80a Add title screen and cut scene 2014-12-07 19:11:11 +01:00
Aaron Mueller 393af0b9b5 cut scene ... working ??? 2014-12-07 19:00:15 +01:00
Ruben Müller 68838fa3c9 Merge branch 'master' of https://github.com/arg-games/ld31
Conflicts:
	src/app.coffee
2014-12-07 18:54:11 +01:00
Ruben Müller c98464bec0 Info button 2014-12-07 18:53:30 +01:00
Aaron Mueller ddceb2fd45 End game 2014-12-07 18:50:22 +01:00
Ruben Müller 3a506cc908 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-07 18:41:43 +01:00
Ruben Müller 4a2ee93577 Speech 2014-12-07 18:41:33 +01:00
Aaron Mueller a3543762d9 fix 2014-12-07 18:39:37 +01:00
Aaron Mueller 0bcc7acd20 energy and game end check 2014-12-07 18:37:18 +01:00
Ruben Müller eb8fa64602 Fixed lava bug 2014-12-07 18:17:33 +01:00
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 0427129db5 Add all bubbles 2014-12-07 18:03:46 +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
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 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
Ruben Müller f02df022d3 Add infobox 2014-12-07 17:21:58 +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
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 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
Ruben Müller abb1d3c3da Colored capacity panel 2014-12-07 15:13:19 +01:00
Ruben Müller c62cc69d15 Added animations 2014-12-07 14:45:13 +01:00
Aaron Mueller d8cfae7940 Entity constraints 2014-12-07 14:13:04 +01:00
Ruben Müller 29ebab4b46 Working on HUD anim 2014-12-07 14:02:42 +01:00
Ruben Müller 35d35da83d Added animated item 2014-12-07 13:48:12 +01:00
Ruben Müller 1ce34f3472 Work on HUD 2014-12-07 13:42:45 +01:00
Ruben Müller 3f8532a830 Show selected entities in HUD 2014-12-07 13:32:10 +01:00
Ruben Müller 3f7fe8c5cf Fix silo storage calculation 2014-12-07 13:22:35 +01:00
Ruben Müller bf6d4ee7dc Fixed mouseout-error 2014-12-07 13:19:53 +01:00
Ruben Müller 8236c2c887 Silo capacity 2014-12-07 12:55:08 +01:00
Ruben Müller d266258052 HUD stuff 2014-12-07 01:08:39 +01:00
Aaron Mueller fe496a24d4 space calculation 2014-12-07 00:47:17 +01:00
Ruben Müller c6619f1247 Snake 2014-12-07 00:46:38 +01:00
Ruben Müller 0fd6b91117 Show progress bar on hover 2014-12-07 00:28:16 +01:00
Aaron Mueller dbea27ca39 +silos, polishing, gfx 2014-12-07 00:20:55 +01:00
Ruben Müller 298849c2fb HUD position fix 2014-12-07 00:17:16 +01:00
Ruben Müller 927ae718f7 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-07 00:15:22 +01:00
Ruben Müller 56396ba979 HUD improvements 2014-12-07 00:15:16 +01:00