71 Commits

Author SHA1 Message Date
Jack Rus
add46e7203 progress 2020-02-02 15:16:44 -05:00
Jack Rus
49696ef9fa progress 2020-02-02 15:00:33 -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
401ae023a2 fixed jack bug levitating 2020-02-02 13:21:44 -05:00
d4cca79ab3 made more bugs 2020-02-02 12:12:11 -05:00
34fef55f67 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 10:22:01 -05:00
c2977d355d finished fixing events control 2020-02-02 10:20:34 -05:00
Sweet Tini
df2cad77b9 Add Jack Bug animation 2020-02-02 09:32:37 -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
fd246fb6fc merge 2020-02-01 23:52:52 -05:00
79812da2c5 Added fighting animation 2020-02-01 23:51:06 -05:00
Sweet Tini
2910f5548d Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 23:47:46 -05:00
Sweet Tini
457d3c6a50 Add Hurt animation to player 2020-02-01 23:47:43 -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
393d6fa4cb merge 2020-02-01 21:28: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
Jack Rus
0f76de2938 completed health and stamikna script 2020-02-01 20:32:24 -05:00
Sweet Tini
e83d6ccf59 Add tileset. 2020-02-01 20:05:47 -05:00
chyknkat
e537b45f42 new buttons and plus 2020-02-01 18:38:02 -05:00
Jack Rus
714c6fcd49 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 17:47:54 -05:00
Jack Rus
77a896bd44 progress landscape 2020-02-01 17:42:34 -05:00
0ff71d5942 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 17:42:00 -05:00
080bfadb7a Continued working on event controls 2020-02-01 17:41:50 -05:00
Sweet Tini
8c8402595f merge 2020-02-01 17:40:02 -05:00
Sweet Tini
9304fac22a Add bug fight animation 2020-02-01 17:35:21 -05:00
chyknkat
a022aed792 update coffee 2020-02-01 16:22:14 -05:00
7b2ea7d2c0 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 15:58:02 -05:00
03cb2ece8b fixed issues with player 2020-02-01 15:50:49 -05:00
Jack Rus
7993d7c2b8 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 15:50:24 -05:00
Jack Rus
281685f3bb landscape - almost done 2020-02-01 15:46:38 -05:00
chyknkat
93f8fc11bb added plus asset 2020-02-01 15:25:45 -05:00
chyknkat
62f7b1e512 add buttons asset 2020-02-01 15:12:00 -05:00
Sweet Tini
2175ef438e Set up enemy animation and HUD elements 2020-02-01 14:37:59 -05:00
Sweet Tini
1428953f92 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 14:01:56 -05:00
Sweet Tini
cdf0067357 Add Gio bug animation 2020-02-01 14:01:54 -05:00
chyknkat
43c962f9a5 add heart asset 2020-02-01 13:37:36 -05:00
588df6407f Finished making successful path for event controls 2020-02-01 13:27:07 -05:00
950efeab81 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 11:44:46 -05:00
5b812bbb32 Finished event control displaying and movement 2020-02-01 11:44:43 -05:00
chyknkat
c69f89b174 stamina bar asset 2020-02-01 11:36:57 -05:00
Sweet Tini
23d4e7fa14 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 11:30:09 -05:00
Sweet Tini
3b2c37d29c Add rest of basic player animations 2020-02-01 11:30:03 -05:00
chyknkat
edcd568d1c Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 10:43:51 -05:00