Commit Graph

163 Commits

Author SHA1 Message Date
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
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
Sweet Tini
5979583c5b Add basic animations 2020-02-01 09:55:33 -05:00
Jack Rus
c5701123ba Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 09:30:16 -05:00
Jack Rus
8e8f0f5a02 progress 2020-02-01 09:28:35 -05:00
Giovani
67a607602c fixed merge 2020-02-01 09:25:02 -05:00
Jack Rus
90d11ef4cb Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 09:00:24 -05:00
Jack Rus
5d8d35feed progress 2020-02-01 08:58:53 -05:00
Giovani
377a6643a8 Fixed issue with wall jump and added event controls 2020-02-01 08:58:17 -05:00
Giovani
6c77ea02c8 day one complete 2020-02-01 01:47:44 -05:00
Giovani
1f746dcab9 progress 2020-01-31 23:46:30 -05:00
Sweet Tini
46af87389f Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-01-31 23:39:39 -05:00
Sweet Tini
bcab6e7c43 Update pixel per unit to 16 2020-01-31 23:34:26 -05:00
Giovani
52fb13f96e progress 2020-01-31 23:23:31 -05:00
Giovani
8b886ba52c in progress bug movement 2020-01-31 23:03:38 -05:00
Jack Rus
eb82b505fc Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-01-31 21:21:22 -05:00
Jack Rus
a610edc143 minor 2020-01-31 21:21:14 -05:00
Giovani
4f0858d0d2 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-01-31 21:10:05 -05:00
Giovani
833fed86f3 created player movement, jump and run faster 2020-01-31 21:09:46 -05:00