Commit Graph

85 Commits

Author SHA1 Message Date
chyknkat
f1d5b87bf2 add intro music 2020-02-01 22:42:47 -05:00
chyknkat
8f050574ea add bug laugh 2020-02-01 22:15:40 -05:00
chyknkat
8c229d2c58 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 21:31:12 -05:00
chyknkat
67a425cec2 add scream and wrong button to assets and sound manager 2020-02-01 21:30:59 -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
chyknkat
21fcc6a344 add jump sound 2020-02-01 21:09:17 -05:00
Giovani
24567da686 fixed player bugs 2020-02-01 21:09:12 -05:00
Sweet Tini
600b56ed14 Add stamina bar piece 2020-02-01 20:50:30 -05:00
Jack Rus
bd84a24532 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 20:32:28 -05:00
Jack Rus
19844c0379 completed health and stamikna script 2020-02-01 20:32:24 -05:00
Sweet Tini
a4ebbf0b85 Add tileset. 2020-02-01 20:05:47 -05:00
chyknkat
11bcf7e0af add music 2020-02-01 19:42:19 -05:00
chyknkat
597d8c6187 new buttons and plus 2020-02-01 18:38:02 -05:00
Jack Rus
552b575b60 completed landscape 2020-02-01 18:00:20 -05:00
Jack Rus
a4e7524af7 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 17:47:54 -05:00
Jack Rus
8679a87051 progress landscape 2020-02-01 17:42:34 -05:00
Giovani
8a25d46cdc Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 17:42:00 -05:00
Giovani
8b3e6f68bb Continued working on event controls 2020-02-01 17:41:50 -05:00
Sweet Tini
16b87b279f merge 2020-02-01 17:40:02 -05:00
Sweet Tini
b2d97043a6 Add bug fight animation 2020-02-01 17:35:21 -05:00
Giovani
c6d62ba276 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 16:24:25 -05:00
Giovani
e8638b21d1 fixed camera issue 2020-02-01 16:24:17 -05:00
Jack Rus
bd1c9889dd Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 16:23:52 -05:00
Jack Rus
7f8ff96821 landscape fixes 2020-02-01 16:23:21 -05:00
chyknkat
141ad4a3b7 update coffee 2020-02-01 16:22:14 -05:00
Giovani
1e05c787ac merge 2020-02-01 15:59:22 -05:00
Giovani
8bfcae21d8 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 15:58:02 -05:00
Giovani
a776ef3c17 fixed issues with player 2020-02-01 15:50:49 -05:00
Jack Rus
02900a15f3 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 15:50:24 -05:00
Jack Rus
da4430ad4c landscape - almost done 2020-02-01 15:46:38 -05:00
chyknkat
161190729c added plus asset 2020-02-01 15:25:45 -05:00
chyknkat
31434f7a04 add buttons asset 2020-02-01 15:12:00 -05:00
Giovani
9889dc1856 fixed run animation 2020-02-01 14:43:41 -05:00
Giovani
04e2523fba Add control 2020-02-01 14:39:57 -05:00
Giovani
a17c6048fb event controls WIP 2020-02-01 14:39:17 -05:00
Sweet Tini
a7b7061a4c Set up enemy animation and HUD elements 2020-02-01 14:37:59 -05:00
Sweet Tini
71e336def5 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 14:01:56 -05:00
Sweet Tini
804a4764cb Add Gio bug animation 2020-02-01 14:01:54 -05:00
chyknkat
a21e6fcff0 add heart asset 2020-02-01 13:37:36 -05:00
Giovani
9a6f7f7a37 Finished making successful path for event controls 2020-02-01 13:27:07 -05:00
Sweet Tini
38bdbfff40 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 11:51:34 -05:00
Sweet Tini
9a1f4d63f4 Modify player logic to use animation parameters 2020-02-01 11:51:23 -05:00
Giovani
1ac33a79d9 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 11:44:46 -05:00
Giovani
89427f7a90 Finished event control displaying and movement 2020-02-01 11:44:43 -05:00
chyknkat
f16895d02c stamina bar asset 2020-02-01 11:36:57 -05:00
Sweet Tini
5d655126cf Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 11:30:09 -05:00
Sweet Tini
a09a16a00d Add rest of basic player animations 2020-02-01 11:30:03 -05:00
chyknkat
911a3af5d1 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 10:43:51 -05:00