Commit graph

102 commits

Author SHA1 Message Date
Aaron Mueller
d157a4f07c activate ticks, now we have a real game 2014-12-06 21:25:15 +01:00
Ruben Müller
31c9ba5f6a Fix 2014-12-06 21:12:48 +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
Ruben Müller
6134c64514 Working on tiles 2014-12-06 20:51:21 +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
61c9bbbbaf Miners do cost something, now 2014-12-06 20:05:02 +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
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
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
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
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
81548836a1 Working on miners 2014-12-06 17:17:33 +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
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
Aaron Mueller
d939e53ce2 .. 2014-12-06 15:10:03 +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
Aaron Mueller
2dc33d9c36 changes ... 2014-12-06 14:52:12 +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
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
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
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
Aaron Mueller
f5b3c0a91f Start implementing the HUD 2014-12-06 12:55:43 +01:00
Aaron Mueller
5bda68d44a Draw the tiles 2014-12-06 12:37:57 +01:00
Aaron Mueller
374ccd95ce working 2014-12-06 10:34:53 +01:00
Ruben Müller
cc95f8f36f Stuff 2014-12-06 09:59:01 +01:00
Aaron Mueller
c947c4ac08 ... 2014-12-06 09:29:49 +01:00
Ruben Müller
b6492202c2 Start work on the entities... 2014-12-06 09:16:55 +01:00
Aaron Mueller
7234373153 First working version 2014-12-06 08:37:36 +01:00
Aaron Mueller
e907b1a5ba Start building this thing 2014-12-06 08:23:17 +01:00
Ruben Müller
ff293007b3 Environment is set up – testing this. 2014-12-02 21:55:42 +01:00
Aaron Mueller
b917544ef3 Prepare for war. 2014-12-02 00:01:16 +01:00