Commit graph

167 commits

Author SHA1 Message Date
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
Jonas1989
2c51828dfd add tileset 2014-12-06 14:57:07 +01:00
Ruben Müller
84a995e738 Cleaup whitespace 2014-12-06 14:56:40 +01:00
Ruben Müller
ee4718bb6e Cleanup 2014-12-06 14:55:33 +01:00
Ruben Müller
39053509ff Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-06 14:54:30 +01:00
Ruben Müller
552db159c6 Add new asset 2014-12-06 14:54:25 +01:00
Aaron Mueller
2dc33d9c36 changes ... 2014-12-06 14:52:12 +01:00
Jonas1989
e25de69561 Add Sounds and tileset 2014-12-06 14:51:39 +01:00
Ruben Müller
f82c2b3157 Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-06 14:30:08 +01:00
Ruben Müller
f82dda6aa1 Yay, variations 2014-12-06 14:29:56 +01:00
Ruben Müller
a44117d1dd Tileset fun 2014-12-06 14:28:58 +01:00
Ruben Müller
76414f3ea2 New assets 2014-12-06 14:27:52 +01:00
Aaron Mueller
0fd3f60aeb Show resources 2014-12-06 14:14:32 +01:00
Aaron Mueller
2a9deedee7 works 2014-12-06 13:55:05 +01:00
Jonas1989
59d5e4c50e Add Layers 2014-12-06 13:54:26 +01:00
Aaron Mueller
c35af25d1c need to change the diaper .... :D 2014-12-06 13:27:44 +01:00
Aaron Mueller
22e61f4e13 tiles ... 2014-12-06 13:15:57 +01:00
Ruben Müller
d41ff29aa0 Update gulp. 2014-12-06 13:14:06 +01:00
Ruben Müller
038ab4f160 Add tileset asset. 2014-12-06 13:13:44 +01:00
Jonas1989
495d1374f2 Add Charset and Terrains 2014-12-06 13:05:44 +01:00
Ruben Müller
df3928493f Merge branch 'master' of https://github.com/arg-games/ld31 2014-12-06 12:57:39 +01:00
Ruben Müller
c52e532d69 Working on tile stuff. 2014-12-06 12:57:25 +01:00