1
Fork 0
mirror of https://github.com/Steffo99/bleach-beach.git synced 2024-12-04 19:04:19 +00:00
Commit graph

60 commits

Author SHA1 Message Date
094fb7b1b0 Fix animation 2018-08-12 16:53:14 +02:00
Lorenzo Balugani
cd5be643ef Merge branch 'master' of https://github.com/Steffo99/ld42 2018-08-12 16:23:24 +02:00
Lorenzo Balugani
df4761c706 Add fade animation
It does not work, btw
2018-08-12 16:22:39 +02:00
69a2bcc6f0 asd 2018-08-12 16:22:09 +02:00
5d85a303dc Merge branch 'master' of https://github.com/Steffo99/ld42 2018-08-12 16:14:47 +02:00
aa739a70b7 many things 2018-08-12 16:14:34 +02:00
Lorenzo Balugani
35ddd9033f Added trigger in Main Menu
Added the game start Trigger
2018-08-12 15:35:20 +02:00
Lorenzo Balugani
99ccb95dc0 Added collisions in mainmenu
Add collision
2018-08-12 15:04:37 +02:00
Lorenzo Balugani
2a934f7e65 Fixed Terrain Collision Box
Now it's a box!
2018-08-12 14:45:14 +02:00
6f8616a9d0 ??? 2018-08-12 14:36:01 +02:00
Maxim Lobovsky
9e02aff81c Merge branch 'master' of https://github.com/Steffo99/ld42 2018-08-12 14:32:44 +02:00
Maxim Lobovsky
3b5e43b49c aggiunto mirino 2018-08-12 14:32:42 +02:00
e132b4c6eb Working Harpoon 2018-08-12 13:09:12 +02:00
Maxim Lobovsky
29f2ba5f23 aggiornato il terreno 2018-08-12 01:49:55 +02:00
406f0e565e idk stuff 2018-08-12 01:47:38 +02:00
e050f3d913 Merge remote-tracking branch 'refs/remotes/origin/master' 2018-08-12 00:43:55 +02:00
fc7ef768a4 Add working cannon and harpoon 2018-08-12 00:42:06 +02:00
Lorenzo Balugani
b13b59b1db Add lighthouse
Added lighthouse in the parallax background
2018-08-11 19:21:32 +02:00
8ce156e6d5 Quanta roba 2018-08-11 18:59:42 +02:00
730d33dc15 Merge branch 'master' of https://github.com/Steffo99/ld42 2018-08-11 18:53:44 +02:00
Maxim Lobovsky
586786063d aggiunto faro che fa schifo, poi lo devo cambiare 2018-08-11 18:52:45 +02:00
fd7831569a Merge branch 'master' of https://github.com/Steffo99/ld42 2018-08-11 18:19:58 +02:00
Maxim Lobovsky
e109dd2d99 Merge branch 'master' of https://github.com/Steffo99/ld42 2018-08-11 18:19:18 +02:00
Maxim Lobovsky
9f851caab4 aggiunte fiammette 2018-08-11 18:19:15 +02:00
c5b9c95546 Merge remote-tracking branch 'refs/remotes/origin/master' 2018-08-11 18:11:38 +02:00
Lorenzo Balugani
cf258d47ab Add Parallax
Added Parallax effect
2018-08-11 18:04:07 +02:00
531a76ad09 Mash of stuff 2018-08-11 17:58:34 +02:00
Maxim Lobovsky
9214ea13f4 sfondo added 2018-08-11 17:54:38 +02:00
Maxim Lobovsky
8faf790d93 aggiunte ondine 2018-08-11 17:37:01 +02:00
Lorenzo Balugani
131165c485 Start main menu
Created main menu (concept)
2018-08-11 16:48:57 +02:00
3b28091bde Fix sea position 2018-08-11 16:28:41 +02:00
42cb8393ae Fix tide 2018-08-11 16:20:57 +02:00
38c7ddf0bd Merge remote-tracking branch 'refs/remotes/origin/master' 2018-08-11 16:02:33 +02:00
28ea268166 habemus hook 2018-08-11 16:01:09 +02:00
Lorenzo Balugani
6516c154a4 Merge branch 'master' of https://github.com/Steffo99/ld42 2018-08-11 15:55:55 +02:00
Lorenzo Balugani
6ac652fa11 Add sea texture
Now the sea exists, apparently
2018-08-11 15:55:51 +02:00
Maxim Lobovsky
545e8e0c9c aggiunto cannone 2018-08-11 15:36:26 +02:00
Maxim Lobovsky
44c21a1925 ho aggiunto il pesce 2018-08-11 15:21:15 +02:00
Maxim Lobovsky
e1b955bc85 aggiunta acquetta 2018-08-11 14:44:32 +02:00
Maxim Lobovsky
a45136bac9 aggiunti catena e arpione 2018-08-11 14:23:36 +02:00
Maxim Lobovsky
75d95a96d6 Merge branch 'master' of https://github.com/Steffo99/ld42 2018-08-11 14:23:15 +02:00
Maxim Lobovsky
878a265208 rimosso scafo sbagliato, aggiunto scafo giusto 2018-08-11 14:03:11 +02:00
b75ef0d7a1 Add hull 2018-08-11 13:56:57 +02:00
efb5a91535 Merge branch 'master' of https://github.com/Steffo99/ld42 2018-08-11 13:12:01 +02:00
Maxim Lobovsky
cba033f3eb Merge branch 'master' of https://github.com/Steffo99/ld42 2018-08-11 13:11:35 +02:00
Maxim Lobovsky
71ad15acfc added scaf 2018-08-11 13:11:22 +02:00
0ccf376e12 TUTTO 2018-08-11 13:02:45 +02:00
e45f4362ba Merge branch 'master' of https://github.com/Steffo99/ld42 2018-08-11 12:52:48 +02:00
ed8a88df70 Add stuff 2018-08-11 12:52:41 +02:00
Lorenzo Balugani
8c3d2fe05e Add Collision Box
Added the collision for the reef
2018-08-11 12:46:56 +02:00