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
|
148ea3d9b4
|
Merge remote-tracking branch 'origin/master'
|
2014-12-07 14:00:22 +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 |
|
Ruben Müller
|
0d772735e8
|
Merge branch 'master' of https://github.com/arg-games/ld31
|
2014-12-07 13:48:17 +01:00 |
|
Ruben Müller
|
35d35da83d
|
Added animated item
|
2014-12-07 13:48:12 +01:00 |
|
Jonas1989
|
a509b65e0a
|
Merge remote-tracking branch 'origin/master'
|
2014-12-07 13:47:26 +01:00 |
|
Jonas1989
|
45598381db
|
add effects
|
2014-12-07 13:47:18 +01:00 |
|
Ruben Müller
|
0ef1a15efc
|
Merge branch 'master' of https://github.com/arg-games/ld31
|
2014-12-07 13:42:55 +01:00 |
|
Ruben Müller
|
1ce34f3472
|
Work on HUD
|
2014-12-07 13:42:45 +01:00 |
|
Jonas1989
|
b7df9c356c
|
add effects
|
2014-12-07 13:42:16 +01:00 |
|
Ruben Müller
|
3f8532a830
|
Show selected entities in HUD
|
2014-12-07 13:32:10 +01:00 |
|
Jonas1989
|
0dc491909a
|
add entities and layers
|
2014-12-07 13:23:02 +01:00 |
|
Ruben Müller
|
3f7fe8c5cf
|
Fix silo storage calculation
|
2014-12-07 13:22:35 +01:00 |
|
Ruben Müller
|
c4662dba5b
|
Merge branch 'master' of https://github.com/arg-games/ld31
|
2014-12-07 13:20:08 +01:00 |
|
Ruben Müller
|
bf6d4ee7dc
|
Fixed mouseout-error
|
2014-12-07 13:19:53 +01:00 |
|
Jonas1989
|
b58dcd0f84
|
add layers
|
2014-12-07 13:17:50 +01:00 |
|
Jonas1989
|
5cc38fadd5
|
Merge remote-tracking branch 'origin/master'
|
2014-12-07 13:10:29 +01:00 |
|
Jonas1989
|
b3b525bb22
|
add entities
|
2014-12-07 13:10:21 +01:00 |
|
Aaron Mueller
|
1e3828511e
|
Add TODO
|
2014-12-07 13:01:39 +01:00 |
|
Ruben Müller
|
8236c2c887
|
Silo capacity
|
2014-12-07 12:55:08 +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
|
fe496a24d4
|
space calculation
|
2014-12-07 00:47:17 +01:00 |
|
Ruben Müller
|
c6619f1247
|
Snake
|
2014-12-07 00:46:38 +01:00 |
|
Ruben Müller
|
0fd6b91117
|
Show progress bar on hover
|
2014-12-07 00:28:16 +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 |
|
Ruben Müller
|
298849c2fb
|
HUD position fix
|
2014-12-07 00:17:16 +01:00 |
|
Ruben Müller
|
927ae718f7
|
Merge branch 'master' of https://github.com/arg-games/ld31
|
2014-12-07 00:15:22 +01:00 |
|
Ruben Müller
|
56396ba979
|
HUD improvements
|
2014-12-07 00:15:16 +01:00 |
|
Jonas1989
|
599c7ae455
|
add entities
|
2014-12-06 23:47:45 +01:00 |
|
Aaron Mueller
|
a84905a74d
|
Show the miner again
|
2014-12-06 23:20:51 +01:00 |
|
Aaron Mueller
|
cccb2eff5b
|
More refactoring work ....
|
2014-12-06 23:17:58 +01:00 |
|
Aaron Mueller
|
815fa7d2d1
|
Refactor the miners to entity
|
2014-12-06 22:07:47 +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 |
|
Aaron Mueller
|
4acbe34b35
|
Add bars only on mining tiles
|
2014-12-06 21:47:58 +01:00 |
|
Aaron Mueller
|
c4ba7c582b
|
Refactor the folder structure
|
2014-12-06 21:36:36 +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 |
|
Aaron Mueller
|
d157a4f07c
|
activate ticks, now we have a real game
|
2014-12-06 21:25:15 +01:00 |
|
Jonas1989
|
4d7a9412f1
|
Merge remote-tracking branch 'origin/master'
|
2014-12-06 21:24:25 +01:00 |
|
Jonas1989
|
0f777df0b0
|
add hud
|
2014-12-06 21:24:17 +01:00 |
|
Ruben Müller
|
571d70a072
|
Merge branch 'master' of https://github.com/arg-games/ld31
|
2014-12-06 21:12:54 +01:00 |
|
Ruben Müller
|
31c9ba5f6a
|
Fix
|
2014-12-06 21:12:48 +01:00 |
|