Commit Graph

84 Commits

Author SHA1 Message Date
Jack Rus
b00811a8b0 added coffee 2020-02-02 16:39:20 -05:00
chyknkat
ec4eb9d013 add sounds to intro story 2020-02-02 16:23:26 -05:00
11b1d4e721 changes 2020-02-02 16:11:24 -05:00
0dd1d0f87a last changes 2020-02-02 16:10:45 -05:00
8b6df6d828 merge 2020-02-02 16:04:06 -05:00
b3960e8d36 scene changes 2020-02-02 16:03:22 -05:00
Jack Rus
a8919fccf6 added bugs 2020-02-02 15:59:19 -05:00
0706b3497b level design 2020-02-02 15:53:52 -05:00
91d53ac010 stamina and health fix 2020-02-02 15:26:50 -05:00
0aeea4833c fixe collectibles 2020-02-02 15:16:13 -05:00
Jack Rus
34ee0e7357 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 15:03:44 -05:00
4ecd89e406 added button animation 2020-02-02 15:00:34 -05:00
Jack Rus
49696ef9fa progress 2020-02-02 15:00:33 -05:00
e65ae28903 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 13:43:19 -05:00
b0f14d6f98 changes 2020-02-02 13:41:52 -05:00
Jack Rus
0598179ff3 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 13:39:17 -05:00
Jack Rus
7c85fdd17f new coffee animation 2020-02-02 13:38:11 -05:00
d56af3e3e3 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 13:22:51 -05:00
401ae023a2 fixed jack bug levitating 2020-02-02 13:21:44 -05:00
Jack Rus
33f9042b2b progress 2020-02-02 13:03:45 -05:00
1efd116c1f Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 12:19:35 -05:00
d4cca79ab3 made more bugs 2020-02-02 12:12:11 -05:00
Jack Rus
5e2c7a9c97 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 11:38:59 -05:00
Jack Rus
eaa3de56e4 game over scene 2020-02-02 11:35:23 -05:00
Sweet Tini
682b2159ad Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 11:02:08 -05:00
Sweet Tini
e372a00d84 Add parallax scrolling to level 2020-02-02 11:01:59 -05:00
chyknkat
7cd3f2083d fix conflicts 2020-02-02 10:37:55 -05:00
chyknkat
da15566f31 add fight sounds 2020-02-02 10:35:28 -05:00
b93b0f7cfe Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 10:33:06 -05:00
16d9e40638 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 10:32:16 -05:00
Jack Rus
508204b3b8 minor fixes for sorting layers 2020-02-02 10:31:47 -05:00
Jack Rus
21b65df41f started parallax 2020-02-02 10:21:38 -05:00
c2977d355d finished fixing events control 2020-02-02 10:20:34 -05:00
a87e8ff093 merge update 2020-02-02 01:28:35 -05:00
e39ea0197d Fixed issue with friction on wall 2020-02-02 01:16:26 -05:00
Jack Rus
1d02c56737 merge 2020-02-01 23:56:01 -05:00
Jack Rus
e4b46c25cd completed landscape 2020-02-01 23:53:18 -05:00
79812da2c5 Added fighting animation 2020-02-01 23:51:06 -05:00
0e16dc5f9f finally fixed player getting stuck 2020-02-01 23:10:39 -05:00
9aca11b57b Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 22:45:18 -05:00
30c965ddc4 Continued working on event controls 2020-02-01 22:45:05 -05:00
Jack Rus
a0c56f41bf Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 22:45:02 -05:00
Jack Rus
ba5a2ebf9e new tile map 2020-02-01 22:44:45 -05:00
a5ffb63a31 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 21:28:23 -05:00
393d6fa4cb merge 2020-02-01 21:28:12 -05:00
chyknkat
e4294a01ac Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 21:09:23 -05:00
chyknkat
40521063e4 add jump sound 2020-02-01 21:09:17 -05:00
5ada160f60 fixed player bugs 2020-02-01 21:09:12 -05:00
Sweet Tini
4f4f374658 Add stamina bar piece 2020-02-01 20:50:30 -05:00
Jack Rus
0173c229f9 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 20:32:28 -05:00