Commit graph

31 commits

Author SHA1 Message Date
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
Ruben Müller
cc95f8f36f Stuff 2014-12-06 09:59:01 +01:00
Aaron Mueller
c947c4ac08 ... 2014-12-06 09:29:49 +01:00
Aaron Mueller
2da8f82356 remove public/app.js 2014-12-06 08:38:57 +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