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
|
71d87ed23c
|
suicide
|
2017-01-21 18:30:37 +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
|
ea65745aea
|
shader fix, hit animation
|
2017-01-21 18:10:31 +01:00 |
|
serk
|
4152f72a13
|
def diferent
|
2017-01-21 18:00:31 +01:00 |
|
serk
|
8276d66807
|
def diferent
|
2017-01-21 17:58:55 +01:00 |
|
serk
|
bdc23b64e4
|
parametrizado
|
2017-01-21 16:52:53 +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 |
|
marti.lloveras
|
bfa92e8b43
|
Suicide
|
2017-01-21 15:41:45 +01:00 |
|
Ralusama19
|
2ecc50d1d8
|
Merge branch 'master' of github.com:ralucado/WaveGGJ17
|
2017-01-21 14:29:13 +01:00 |
|
Ralusama19
|
cc0d1e80eb
|
added sound buffers
|
2017-01-21 14:29:08 +01:00 |
|
marti.lloveras
|
0ac2b1c01b
|
pragma omp parallel barrier
|
2017-01-21 14:23:05 +01:00 |
|
marti.lloveras
|
66377e60ee
|
Merge branch 'master' of github.com:ralucado/WaveGGJ17
|
2017-01-21 14:02:42 +01:00 |
|
marti.lloveras
|
6258dc8e7d
|
vaporwave
|
2017-01-21 14:02:19 +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
|
a843c0faca
|
fix overlaping animations
|
2017-01-21 13:32:20 +01:00 |
|
marti.lloveras
|
1184a03f5f
|
getter
|
2017-01-21 13:21:12 +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
|
a0557eff8f
|
Merge branch 'master' of github.com:ralucado/WaveGGJ17
|
2017-01-21 12:39:54 +01:00 |
|
Ralusama19
|
a61ff90f8c
|
fixed path stuff
|
2017-01-21 12:39:49 +01:00 |
|
marti.lloveras
|
e90d2dd3f1
|
Animacio més rapida
|
2017-01-21 11:58:15 +01:00 |
|
marti.lloveras
|
770739c352
|
Animacio 2p
|
2017-01-21 11:47:43 +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
|
c9255d854d
|
Merge branch 'master' into serk
|
2017-01-21 05:34:10 +01:00 |
|
marti.lloveras
|
a7e9dd9229
|
2 players color(?)
|
2017-01-21 05:33:34 +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 |
|
marti.lloveras
|
bd87393e9b
|
2 players?
|
2017-01-21 05:08:43 +01:00 |
|
serk
|
96d80e1c4b
|
Merge branch 'master' into serk
|
2017-01-21 04:41:02 +01:00 |
|
serk
|
f8595bce4c
|
background
|
2017-01-21 04:40:20 +01:00 |
|
marti.lloveras
|
7f79a87e7f
|
Bazzinga
|
2017-01-21 04:35:46 +01:00 |
|
serk
|
8a38afc7e7
|
for the merge
|
2017-01-21 04:32:54 +01:00 |
|
marti.lloveras
|
64a48d69fb
|
Merge branch 'master' of github.com:ralucado/WaveGGJ17
|
2017-01-21 04:31:29 +01:00 |
|
marti.lloveras
|
96b44d2506
|
Character funcionaaa
|
2017-01-21 04:30:12 +01:00 |
|
serk
|
05abe3c50a
|
fixed error
|
2017-01-21 04:08:44 +01:00 |
|
Ralusama19
|
45f1051b8c
|
integrados players. creo.
|
2017-01-21 03:42:50 +01:00 |
|
serk
|
704bbb068c
|
Merge branch 'master' of https://github.com/ralucado/WaveGGJ17
|
2017-01-21 03:25:17 +01:00 |
|
serk
|
e5bb93e489
|
fix
|
2017-01-21 03:24:24 +01:00 |
|
marti.lloveras
|
0364fa8ef0
|
CHaracter que no funxiona
|
2017-01-21 03:18:55 +01:00 |
|
serk
|
0859b78f94
|
merge fix
|
2017-01-21 03:07:55 +01:00 |
|
serk
|
f090173a1e
|
Merge branch 'master' into serk
|
2017-01-21 02:35:26 +01:00 |
|
serk
|
226a7b7657
|
aux commit
|
2017-01-21 02:32:26 +01:00 |
|
marti.lloveras
|
d8713ee98b
|
Merge branch 'master' of github.com:ralucado/WaveGGJ17
|
2017-01-21 01:54:24 +01:00 |
|
marti.lloveras
|
a738f260ef
|
Character
|
2017-01-21 01:53:45 +01:00 |
|
Ralusama19
|
9319bbf783
|
renamed stuff
|
2017-01-21 01:30:46 +01:00 |
|
Ralusama19
|
98506b1121
|
fixed merge with compass
|
2017-01-21 01:07:31 +01:00 |
|
Ralusama19
|
cebde72729
|
menu and scenes
|
2017-01-20 23:52:42 +01:00 |
|
serk
|
7c734d12a3
|
merge?
|
2017-01-20 23:26:30 +01:00 |
|
serk
|
06878adc7e
|
debuged
|
2017-01-20 23:13:36 +01:00 |
|
Ralusama19
|
3ba7354efe
|
Merge branch 'master' of github.com:ralucado/WaveGGJ17
|
2017-01-20 22:24:36 +01:00 |
|
Ralusama19
|
d0fe003630
|
player states. removed build folder
|
2017-01-20 22:24:32 +01:00 |
|
serk
|
6e5f7d851a
|
add class compas
|
2017-01-20 22:12:10 +01:00 |
|
Ralusama19
|
c64ab18b50
|
finished! jk. habemus esqueleto
|
2017-01-20 20:59:31 +01:00 |
|