Commit graph

56 commits

Author SHA1 Message Date
Ruben Müller 6f482e8d2c Speechbubble work 2014-12-07 15:52:54 +01:00
Jonas1989 4a833902cc addlayers-details 2014-12-07 15:18:48 +01:00
Jonas1989 0bc344464d add actions 2014-12-07 14:35:53 +01:00
Jonas1989 74cd1bdf4c add actions 2014-12-07 14:27:56 +01:00
Jonas1989 dfbcb1598c add actions 2014-12-07 14:10:53 +01:00
Ruben Müller 09fce2c34b Rename effects 2014-12-07 14:04:04 +01:00
Ruben Müller 5ede943f03 Merge branch 'master' of https://github.com/arg-games/ld31
Conflicts:
	public/images/Effects.png
2014-12-07 14:03:39 +01:00
Jonas1989 c1c01eea79 add effects 2014-12-07 14:02:44 +01:00
Ruben Müller 29ebab4b46 Working on HUD anim 2014-12-07 14:02:42 +01:00
Jonas1989 f87de6febc add layers 2014-12-07 14:00:15 +01:00
Ruben Müller 0a71cdbc49 Renamed asset 2014-12-07 13:48:44 +01:00
Jonas1989 45598381db add effects 2014-12-07 13:47:18 +01:00
Jonas1989 b7df9c356c add effects 2014-12-07 13:42:16 +01:00
Jonas1989 0dc491909a add entities and layers 2014-12-07 13:23:02 +01:00
Jonas1989 b58dcd0f84 add layers 2014-12-07 13:17:50 +01:00
Jonas1989 b3b525bb22 add entities 2014-12-07 13:10:21 +01:00
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 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
Jonas1989 599c7ae455 add entities 2014-12-06 23:47:45 +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
Jonas1989 903949c306 add hud 2014-12-06 21:32:44 +01:00
Jonas1989 92407f6a84 add hud 2014-12-06 21:27:16 +01:00
Jonas1989 0f777df0b0 add hud 2014-12-06 21:24:17 +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
Jonas1989 2a865bb72e add hud 2014-12-06 20:54:37 +01:00
Jonas1989 fd2005cdf8 add hud 2014-12-06 20:52:31 +01:00
Jonas1989 6e79b095e1 add entities 2014-12-06 20:50:08 +01:00
Jonas1989 bdf9abc14f add entities 2014-12-06 19:59:56 +01:00
Aaron Mueller ecfa9d7268 hud work 2014-12-06 19:02:34 +01:00
Jonas1989 48b3b624a0 add entities 2014-12-06 18:58:17 +01:00
Jonas1989 0029492f18 add entities 2014-12-06 17:57:29 +01:00
Jonas1989 ccfee4c958 Add HUD 2014-12-06 17:30:15 +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
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 6d77c7bff0 Added pixel pont 2014-12-06 16:33:24 +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 50dc019ed5 add layers-tileset 2014-12-06 15:12:36 +01:00
Ruben Müller 552db159c6 Add new asset 2014-12-06 14:54:25 +01:00
Ruben Müller 76414f3ea2 New assets 2014-12-06 14:27:52 +01:00
Ruben Müller 038ab4f160 Add tileset asset. 2014-12-06 13:13:44 +01:00