Commit graph

33 commits

Author SHA1 Message Date
serk
d9d2deab51 background 2017-01-21 05:09:40 +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
e9876f676e Merge branch 'serk' 2017-01-21 03:24:52 +01:00
serk
e5bb93e489 fix 2017-01-21 03:24:24 +01:00
marti.lloveras
74d7b3aa73 Merge branch 'master' of github.com:ralucado/WaveGGJ17 2017-01-21 03:19:20 +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
vylion
530487fde6 Added spreadsheets for menu buttons EXIT and PLAY 2017-01-21 03:05:41 +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
vylion
0b8bc0afd7 Added player 2 to the spreadsheet 2017-01-21 02:03:03 +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
vylion
3e03825124 Added spreadsheet 2017-01-21 01:47:13 +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
serk
f1fbf74bc4 test and debuged compas 2017-01-20 23:06:34 +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
Ralu
8780292ef5 Initial commit 2017-01-20 19:41:08 +01:00