Commit graph

122 commits

Author SHA1 Message Date
vylion
32ab66e4dc Merge branch 'master' of https://github.com/ralucado/WaveGGJ17 2017-01-22 02:14:20 +01:00
vylion
43379d6ab0 Parece que ahora funciona 2017-01-22 02:13:53 +01:00
Ralusama19
526e79c716 Merge branch 'master' of github.com:ralucado/WaveGGJ17 2017-01-22 01:53:40 +01:00
Ralusama19
d815176d01 ones al miig 2017-01-22 01:53:35 +01:00
serk
f22f7533cd Merge branch 'master' of https://github.com/ralucado/WaveGGJ17 2017-01-22 01:52:47 +01:00
serk
265782fe86 burbukas 2017-01-22 01:52:13 +01:00
Ralusama19
3134dac3c5 fixed waves. AGAIN. 2017-01-22 01:28:49 +01:00
Ralusama19
c53d63b45b Merge branch 'master' of github.com:ralucado/WaveGGJ17 2017-01-22 01:19:12 +01:00
Ralusama19
2fa629eedf perfect wave 2017-01-22 01:19:08 +01:00
serk
4bf3722bc1 Merge branch 'master' of https://github.com/ralucado/WaveGGJ17 2017-01-22 01:13:37 +01:00
serk
1acfc174b9 hot fix 2017-01-22 01:12:51 +01:00
vylion
b9a52e6192 Refactor of turn managing 2017-01-22 00:56:42 +01:00
Ralusama19
c7cfabfec9 magic numbers, wave in center 2017-01-22 00:53:27 +01:00
Ralusama19
b42413dd77 Merge branch 'master' of github.com:ralucado/WaveGGJ17 2017-01-22 00:30:12 +01:00
Ralusama19
19e293b238 no resize 2017-01-22 00:30:01 +01:00
marti.lloveras
be9ea49ee6 Merge branch 'master' of github.com:ralucado/WaveGGJ17 2017-01-22 00:28:43 +01:00
marti.lloveras
4101691de1 bazzinga 2017-01-22 00:28:36 +01:00
serk
88f9e85b88 merge? visual plataforms 2017-01-22 00:26:44 +01:00
Ralusama19
5a270b10dd more precise magic sync for waves, not in center tho 2017-01-22 00:14:29 +01:00
Ralusama19
69271a6c1f Merge branch 'master' of github.com:ralucado/WaveGGJ17 2017-01-22 00:09:08 +01:00
marti.lloveras
d3de9c5b92 Animacio de success preparada 2017-01-22 00:06:41 +01:00
Ralusama19
e2e36835a7 magic sync for waves, not in center tho 2017-01-22 00:06:14 +01:00
serk
01dcd14236 minor fixes 2017-01-21 23:44:22 +01:00
serk
6038a5ab6f minor fixes 2017-01-21 23:41:00 +01:00
serk
5f4c9b7289 minor fixes 2017-01-21 23:39:10 +01:00
serk
0b4a5f21d3 plataform 3 color 2017-01-21 22:54:28 +01:00
Ralusama19
a1d2df2034 added sounds 2017-01-21 22:31:27 +01:00
marti.lloveras
a03ec5e903 Vylion nuestro dios 2017-01-21 22:28:36 +01:00
serk
7700e2f0f4 plataform 2017-01-21 21:18:38 +01:00
Ralusama19
d8858018de Merge branch 'master' of github.com:ralucado/WaveGGJ17 2017-01-21 20:57:45 +01:00
Ralusama19
e6fd8a2b1d merged waves and halos 2017-01-21 20:57:41 +01:00
marti.lloveras
ac7e8d0bd5 more sprites 2017-01-21 20:55:21 +01:00
Ralusama19
d32840dc51 workin on waves 2017-01-21 20:55:12 +01:00
vylion
d6cb963a82 Added success sprites 2017-01-21 20:40:55 +01:00
serk
6d3e97da9f halo 2017-01-21 19:40:11 +01:00
serk
74256387a0 fix bugg, start shader 2017-01-21 18:43:50 +01:00
serk
8f9c93a6c3 Merge branch 'master' of https://github.com/ralucado/WaveGGJ17 2017-01-21 18:35:54 +01:00
serk
cb23eef01a shder 2017-01-21 18:35:16 +01:00
marti.lloveras
78feb5e092 Merge branch 'master' of github.com:ralucado/WaveGGJ17 2017-01-21 18:30:44 +01:00
marti.lloveras
71d87ed23c suicide 2017-01-21 18:30:37 +01:00
vylion
6c0e90265e Added sprites for turn-indicator platforms and platforms' light 2017-01-21 18:26:31 +01:00
marti.lloveras
dd656cbc60 Merge branch 'master' of github.com:ralucado/WaveGGJ17 2017-01-21 18:24:11 +01:00
marti.lloveras
f986d6cb2d wave files 2017-01-21 18:23:57 +01:00
Ralusama19
5b3b062171 Merge branch 'master' of github.com:ralucado/WaveGGJ17 2017-01-21 18:23:49 +01:00
Ralusama19
4f03953e63 added background for menu 2017-01-21 18:23:44 +01:00
serk
606ae16e07 Merge branch 'master' of https://github.com/ralucado/WaveGGJ17 2017-01-21 18:11:59 +01:00
serk
65e6604673 Merge branch 'serk' 2017-01-21 18:11:45 +01:00
serk
ea65745aea shader fix, hit animation 2017-01-21 18:10:31 +01:00
vylion
c07c2a422e Actially resized signal sprites this time 2017-01-21 18:02:27 +01:00
serk
fc7b6922d0 Merge branch 'master' of https://github.com/ralucado/WaveGGJ17 2017-01-21 18:01:22 +01:00