Commit Graph

146 Commits

Author SHA1 Message Date
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
chyknkat
d940ad88dd add intro music 2020-02-01 22:42:47 -05:00
chyknkat
7b9073457d add bug laugh 2020-02-01 22:15:40 -05:00
chyknkat
c30fbb95d6 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 21:31:12 -05:00
chyknkat
c801dbbec6 add scream and wrong button to assets and sound manager 2020-02-01 21:30:59 -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
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
8fbae5384d add music 2020-02-01 19:42:19 -05:00
chyknkat
e537b45f42 new buttons and plus 2020-02-01 18:38:02 -05:00
Jack Rus
b74112993e completed landscape 2020-02-01 18:00:20 -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
0f9a2d2d16 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 16:24:25 -05:00
2cbc3e965d fixed camera issue 2020-02-01 16:24:17 -05:00
Jack Rus
266ab4bbaf Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 16:23:52 -05:00
Jack Rus
f36312f9f6 landscape fixes 2020-02-01 16:23:21 -05:00
chyknkat
a022aed792 update coffee 2020-02-01 16:22:14 -05:00
87dbaae212 merge 2020-02-01 15:59:22 -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
5f33cf6259 fixed run animation 2020-02-01 14:43:41 -05:00
c02f16e389 Add control 2020-02-01 14:39:57 -05:00
a3e6a4e304 event controls WIP 2020-02-01 14:39:17 -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
Sweet Tini
26083d4112 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 11:51:34 -05:00