Commit graph

188 commits

Author SHA1 Message Date
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
Ruben Müller
2b6fa18b02 Miners can be set 2014-12-06 17:58:03 +01:00
Jonas1989
15d6f375cd Merge remote-tracking branch 'origin/master' 2014-12-06 17:57:36 +01:00
Jonas1989
0029492f18 add entities 2014-12-06 17:57:29 +01:00
Aaron Mueller
8d5e7c10ff Start with the amount indicator 2014-12-06 17:42:38 +01:00
Ruben Müller
eecacde582 Fixed double bug 2014-12-06 17:42:16 +01:00
Ruben Müller
945533b9ed Start with zero score 2014-12-06 17:38:03 +01:00
Aaron Mueller
8b85c12512 dig deep, dude! 2014-12-06 17:32:57 +01:00
Ruben Müller
3753b67b07 Merge branch 'master' of https://github.com/arg-games/ld31
Conflicts:
	src/entities/tile.coffee
	src/main.coffee
2014-12-06 17:30:54 +01:00
Jonas1989
ccfee4c958 Add HUD 2014-12-06 17:30:15 +01:00
Ruben Müller
ebae442b9b Changes 2014-12-06 17:26:12 +01:00
Aaron Mueller
00cfb0cc84 resource collection 2014-12-06 17:20:10 +01:00
Ruben Müller
9f863f232d Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-06 17:17:40 +01:00
Ruben Müller
81548836a1 Working on miners 2014-12-06 17:17:33 +01:00
Jonas1989
1b247d796b add entities 2014-12-06 17:10:58 +01:00
Ruben Müller
05abf401a6 Tiles can be selected now 2014-12-06 16:52:53 +01:00
Ruben Müller
c66e9a68b5 Pixelfont is back 2014-12-06 16:49:29 +01:00
Aaron Mueller
efd34b8b5d Update the active tile indicator 2014-12-06 16:37:00 +01:00
Aaron Mueller
ec6ea33ef5 Mark the active tile 2014-12-06 16:35:17 +01:00
Ruben Müller
b8be2ab4f8 Merge branch 'master' of https://github.com/arg-games/ld31
Conflicts:
	src/main.coffee
2014-12-06 16:33:44 +01:00
Ruben Müller
6d77c7bff0 Added pixel pont 2014-12-06 16:33:24 +01:00
Aaron Mueller
5d5b361764 delegate mouse events directly to the tiles 2014-12-06 15:57:26 +01:00
Jonas1989
b89903bd04 Add some soundfiles 2014-12-06 15:34:55 +01:00
Jonas1989
94a2cd7b2b add layer 2014-12-06 15:22:59 +01:00
Jonas1989
26921f020a add layer 2014-12-06 15:20:34 +01:00
Jonas1989
29902aa10a Merge remote-tracking branch 'origin/master' 2014-12-06 15:12:47 +01:00
Jonas1989
50dc019ed5 add layers-tileset 2014-12-06 15:12:36 +01:00
Aaron Mueller
d939e53ce2 .. 2014-12-06 15:10:03 +01:00