Commit graph

40 commits

Author SHA1 Message Date
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
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
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
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
marti.lloveras
a03ec5e903 Vylion nuestro dios 2017-01-21 22:28:36 +01:00
Ralusama19
e6fd8a2b1d merged waves and halos 2017-01-21 20:57:41 +01:00
Ralusama19
d32840dc51 workin on waves 2017-01-21 20:55:12 +01:00
serk
6d3e97da9f halo 2017-01-21 19:40:11 +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
Ralusama19
4f03953e63 added background for menu 2017-01-21 18:23:44 +01:00
serk
8276d66807 def diferent 2017-01-21 17:58:55 +01:00
serk
24af73dda2 fix error time 2017-01-21 16:39:02 +01:00
Ralusama19
2a8724cb7e added death animation 2017-01-21 16:29:21 +01:00
serk
777384e51e score 2017-01-21 16:27:00 +01:00
Ralusama19
cba2ebf03c click track. window size. music looped and played from myGame 2017-01-21 16:02:46 +01:00
serk
3b3aca7549 merge? 2017-01-21 15:55:40 +01:00
Ralusama19
cc0d1e80eb added sound buffers 2017-01-21 14:29:08 +01:00
Ralusama19
ccc203ad9f Merge branch 'master' of github.com:ralucado/WaveGGJ17 2017-01-21 13:58:50 +01:00
Ralusama19
aa954763fc added music 2017-01-21 13:58:45 +01:00
serk
da23125f92 add error feature 2017-01-21 13:57:32 +01:00
serk
ac2f53a8a8 Merge branch 'master' into serk 2017-01-21 12:41:34 +01:00
serk
267df99593 shader fix 2017-01-21 12:40:34 +01:00
Ralusama19
a61ff90f8c fixed path stuff 2017-01-21 12:39:49 +01:00
serk
279c401f4d ? 2017-01-21 11:09:41 +01:00
serk
992568fe07 pseudo two player implemented 2017-01-21 09:56:00 +01:00
serk
bee83068a4 add players no full game 2017-01-21 05:33:17 +01:00
serk
d9d2deab51 background 2017-01-21 05:09:40 +01:00
serk
f8595bce4c background 2017-01-21 04:40:20 +01:00
serk
8a38afc7e7 for the merge 2017-01-21 04:32:54 +01:00
serk
05abe3c50a fixed error 2017-01-21 04:08:44 +01:00
serk
e5bb93e489 fix 2017-01-21 03:24:24 +01:00
serk
0859b78f94 merge fix 2017-01-21 03:07:55 +01:00
serk
226a7b7657 aux commit 2017-01-21 02:32:26 +01:00