Commit Graph

62 Commits

Author SHA1 Message Date
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
6207eff2bf merge 2020-02-01 23:52:52 -05:00
Giovani
346c246554 Added fighting animation 2020-02-01 23:51:06 -05:00
Sweet Tini
106f5ae2e7 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 23:47:46 -05:00
Sweet Tini
fa681e9267 Add Hurt animation to player 2020-02-01 23:47:43 -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
34d41df2b1 merge 2020-02-01 21:28: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
597d8c6187 new buttons and plus 2020-02-01 18:38:02 -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
chyknkat
141ad4a3b7 update coffee 2020-02-01 16:22:14 -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
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
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
chyknkat
5b60491dbc add kat bug walking sprite 2020-02-01 10:43:20 -05:00
Jack Rus
abdf8add9f Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 10:38:15 -05:00
Jack Rus
e3a96f6064 landscape design 2020-02-01 10:38:09 -05:00
Sweet Tini
6fcf612824 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 10:30:54 -05:00
Sweet Tini
146de8dc81 Remove compression quality on sprites 2020-02-01 10:30:40 -05:00
Giovani
6675d33468 Added player animation to script 2020-02-01 10:29:31 -05:00
Giovani
5b849df5a7 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 09:56:21 -05:00
Giovani
3aebd39119 events control WIP 2020-02-01 09:56:08 -05:00
Sweet Tini
18cf4aedab Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 09:55:35 -05:00