Commit Graph

57 Commits

Author SHA1 Message Date
Giovani
ccbfbfb889 made more bugs 2020-02-02 12:12:11 -05:00
Giovani
c3ca2a7650 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 10:33:06 -05:00
Giovani
5ab2269ae5 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 10:32:16 -05:00
Jack Rus
f0b04c436b minor fixes for sorting layers 2020-02-02 10:31:47 -05:00
Jack Rus
76f3c69f49 started parallax 2020-02-02 10:21:38 -05:00
Giovani
d01bc2ebe9 finished fixing events control 2020-02-02 10:20:34 -05:00
Giovani
cf1c32f0bf merge update 2020-02-02 01:28:35 -05:00
Giovani
6e9be66d9d Fixed issue with friction on wall 2020-02-02 01:16:26 -05:00
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
346c246554 Added fighting animation 2020-02-01 23:51:06 -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
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
chyknkat
11bcf7e0af add music 2020-02-01 19:42:19 -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
8b3e6f68bb Continued working on event controls 2020-02-01 17:41:50 -05:00
Giovani
e8638b21d1 fixed camera issue 2020-02-01 16:24:17 -05:00
Jack Rus
7f8ff96821 landscape fixes 2020-02-01 16:23:21 -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
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
Giovani
9a6f7f7a37 Finished making successful path for event controls 2020-02-01 13:27:07 -05:00
Giovani
89427f7a90 Finished event control displaying and movement 2020-02-01 11:44:43 -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
5d8d35feed progress 2020-02-01 08:58:53 -05:00