Commit Graph

88 Commits

Author SHA1 Message Date
Giovani
73bb67df9f feat: upgrade unity project version 2021-07-02 21:26:29 -04:00
Giovani
42b2214cd6 changes 2020-02-03 09:33:53 -05:00
Giovani
24b26802be Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 16:45:37 -05:00
Jack Rus
63a4871ab8 added coffee 2020-02-02 16:39:20 -05:00
Giovani
ac32881c23 changes 2020-02-02 16:28:35 -05:00
chyknkat
5096ef925c add sounds to intro story 2020-02-02 16:23:26 -05:00
Giovani
a735a21c7a changes 2020-02-02 16:11:24 -05:00
Giovani
fb256c1f2a last changes 2020-02-02 16:10:45 -05:00
Giovani
734a868b7e merge 2020-02-02 16:04:06 -05:00
Giovani
9a86fb2c19 scene changes 2020-02-02 16:03:22 -05:00
Jack Rus
b4c75be293 added bugs 2020-02-02 15:59:19 -05:00
Giovani
2dcda874c4 level design 2020-02-02 15:53:52 -05:00
Giovani
efb32ab11b stamina and health fix 2020-02-02 15:26:50 -05:00
Giovani
8150f2f43e fixe collectibles 2020-02-02 15:16:13 -05:00
Jack Rus
1a7f679328 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 15:03:44 -05:00
Giovani
52cd45f441 added button animation 2020-02-02 15:00:34 -05:00
Jack Rus
f934021e34 progress 2020-02-02 15:00:33 -05:00
Giovani
a46f8e6005 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 13:43:19 -05:00
Giovani
90ccb6690c changes 2020-02-02 13:41:52 -05:00
Jack Rus
e4a151be7e Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 13:39:17 -05:00
Jack Rus
e4802efeb0 new coffee animation 2020-02-02 13:38:11 -05:00
Giovani
e0f425fed2 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 13:22:51 -05:00
Giovani
7798ab67f9 fixed jack bug levitating 2020-02-02 13:21:44 -05:00
Jack Rus
e7ed627314 progress 2020-02-02 13:03:45 -05:00
Giovani
a5694bbf06 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 12:19:35 -05:00
Giovani
ccbfbfb889 made more bugs 2020-02-02 12:12:11 -05:00
Jack Rus
ae8d8db1ee Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 11:38:59 -05:00
Jack Rus
2828151a30 game over scene 2020-02-02 11:35:23 -05:00
Sweet Tini
9a1e04997e Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 11:02:08 -05:00
Sweet Tini
2c4e9c3b61 Add parallax scrolling to level 2020-02-02 11:01:59 -05:00
chyknkat
7934402bad fix conflicts 2020-02-02 10:37:55 -05:00
chyknkat
85c9f1b151 add fight sounds 2020-02-02 10:35:28 -05:00
Giovani
c3ca2a7650 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 10:33:06 -05:00
Giovani
5ab2269ae5 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 10:32:16 -05:00
Jack Rus
f0b04c436b minor fixes for sorting layers 2020-02-02 10:31:47 -05:00
Jack Rus
76f3c69f49 started parallax 2020-02-02 10:21:38 -05:00
Giovani
d01bc2ebe9 finished fixing events control 2020-02-02 10:20:34 -05:00
Giovani
cf1c32f0bf merge update 2020-02-02 01:28:35 -05:00
Giovani
6e9be66d9d Fixed issue with friction on wall 2020-02-02 01:16:26 -05:00
Jack Rus
cd3aa91c4f merge 2020-02-01 23:56:01 -05:00
Jack Rus
9bec85b04b completed landscape 2020-02-01 23:53:18 -05:00
Giovani
346c246554 Added fighting animation 2020-02-01 23:51:06 -05:00
Giovani
8eafec7521 finally fixed player getting stuck 2020-02-01 23:10:39 -05:00
Giovani
618fe2fe8a Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 22:45:18 -05:00
Giovani
71ac507ab9 Continued working on event controls 2020-02-01 22:45:05 -05:00
Jack Rus
aa5f26207e Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 22:45:02 -05:00
Jack Rus
2ea201ba03 new tile map 2020-02-01 22:44:45 -05:00
Giovani
02d80a4084 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 21:28:23 -05:00
Giovani
34d41df2b1 merge 2020-02-01 21:28:12 -05:00
chyknkat
7a21745dba Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 21:09:23 -05:00