Commit graph

165 commits

Author SHA1 Message Date
Ruben Müller
834239d184 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-07 01:09:01 +01:00
Ruben Müller
d266258052 HUD stuff 2014-12-07 01:08:39 +01:00
Jonas1989
37fbf37f6c Merge remote-tracking branch 'origin/master' 2014-12-07 00:58:34 +01:00
Jonas1989
5a3fa051ad Add some soundfiles 2014-12-07 00:58:23 +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
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
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
Jonas1989
599c7ae455 add entities 2014-12-06 23:47:45 +01:00
Aaron Mueller
a84905a74d Show the miner again 2014-12-06 23:20:51 +01:00
Aaron Mueller
cccb2eff5b More refactoring work .... 2014-12-06 23:17:58 +01:00
Aaron Mueller
815fa7d2d1 Refactor the miners to entity 2014-12-06 22:07:47 +01:00
Jonas1989
bd46e22b28 add entities 2014-12-06 21:53:35 +01:00
Jonas1989
3a4d5e37eb add entities 2014-12-06 21:49:33 +01:00
Aaron Mueller
4acbe34b35 Add bars only on mining tiles 2014-12-06 21:47:58 +01:00
Aaron Mueller
c4ba7c582b Refactor the folder structure 2014-12-06 21:36:36 +01:00
Jonas1989
903949c306 add hud 2014-12-06 21:32:44 +01:00
Jonas1989
92407f6a84 add hud 2014-12-06 21:27:16 +01:00
Aaron Mueller
d157a4f07c activate ticks, now we have a real game 2014-12-06 21:25:15 +01:00
Jonas1989
4d7a9412f1 Merge remote-tracking branch 'origin/master' 2014-12-06 21:24:25 +01:00
Jonas1989
0f777df0b0 add hud 2014-12-06 21:24:17 +01:00
Ruben Müller
571d70a072 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-06 21:12:54 +01:00
Ruben Müller
31c9ba5f6a Fix 2014-12-06 21:12:48 +01:00
Jonas1989
8132294369 Merge remote-tracking branch 'origin/master'
Conflicts:
	public/images/layers.png
2014-12-06 21:12:06 +01:00
Jonas1989
7e6b190f0d add layers and entities 2014-12-06 21:09:43 +01:00
Ruben Müller
7056bbc622 Fix 2014-12-06 21:08:46 +01:00
Ruben Müller
c6d131dc32 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-06 21:04:40 +01:00
Aaron Mueller
c7b600a15a Add game tick 2014-12-06 20:54:50 +01:00
Jonas1989
2a865bb72e add hud 2014-12-06 20:54:37 +01:00
Jonas1989
fd2005cdf8 add hud 2014-12-06 20:52:31 +01:00
Ruben Müller
684db68839 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-06 20:51:29 +01:00
Ruben Müller
6134c64514 Working on tiles 2014-12-06 20:51:21 +01:00
Jonas1989
6e79b095e1 add entities 2014-12-06 20:50:08 +01:00
Ruben Müller
471b8da421 Small fix 2014-12-06 20:39:59 +01:00
Ruben Müller
eeb7d50055 Added new miner 2014-12-06 20:08:15 +01:00
Ruben Müller
31c538d6e1 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-06 20:05:16 +01:00
Ruben Müller
61c9bbbbaf Miners do cost something, now 2014-12-06 20:05:02 +01:00
Jonas1989
bdf9abc14f add entities 2014-12-06 19:59:56 +01:00
Ruben Müller
40dade0aa2 Added ticks for miner 2014-12-06 19:49:57 +01:00
Aaron Mueller
ecfa9d7268 hud work 2014-12-06 19:02:34 +01:00
Jonas1989
8adc7d0002 Merge remote-tracking branch 'origin/master' 2014-12-06 18:58:27 +01:00
Jonas1989
48b3b624a0 add entities 2014-12-06 18:58:17 +01:00
Ruben Müller
06d95fc11a Merge branch 'master' of https://github.com/arg-games/ld31
Conflicts:
	src/entities/tile.coffee
2014-12-06 18:54:52 +01:00
Ruben Müller
0e88f82bb2 Merge branch 'master' of https://github.com/arg-games/ld31
Conflicts:
	src/entities/tile.coffee
2014-12-06 18:20:29 +01:00
Aaron Mueller
8a5fb61903 Adjust colors 2014-12-06 18:12:38 +01:00
Aaron Mueller
3daf7f0edf Pimpt the progress bar 2014-12-06 18:10:23 +01:00