Commit Graph

41 Commits

Author SHA1 Message Date
c84faa8b58 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 15:00:38 -05:00
4ecd89e406 added button animation 2020-02-02 15:00:34 -05:00
chyknkat
c6c394343f change sound levels 2020-02-02 14:25:49 -05:00
b0f14d6f98 changes 2020-02-02 13:41:52 -05:00
401ae023a2 fixed jack bug levitating 2020-02-02 13:21:44 -05:00
1efd116c1f Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 12:19:35 -05:00
d4cca79ab3 made more bugs 2020-02-02 12:12:11 -05:00
Jack Rus
5e2c7a9c97 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 11:38:59 -05:00
Jack Rus
eaa3de56e4 game over scene 2020-02-02 11:35:23 -05:00
chyknkat
7cd3f2083d fix conflicts 2020-02-02 10:37:55 -05:00
chyknkat
da15566f31 add fight sounds 2020-02-02 10:35:28 -05:00
16d9e40638 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 10:32:16 -05:00
Jack Rus
21b65df41f started parallax 2020-02-02 10:21:38 -05:00
c2977d355d finished fixing events control 2020-02-02 10:20:34 -05:00
chyknkat
6f2196aa81 add drink and enemy sounds 2020-02-02 00:04:39 -05:00
79812da2c5 Added fighting animation 2020-02-01 23:51:06 -05:00
0e16dc5f9f finally fixed player getting stuck 2020-02-01 23:10:39 -05:00
30c965ddc4 Continued working on event controls 2020-02-01 22:45:05 -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
Jack Rus
0f76de2938 completed health and stamikna script 2020-02-01 20:32:24 -05:00
2cbc3e965d fixed camera issue 2020-02-01 16:24:17 -05:00
03cb2ece8b fixed issues with player 2020-02-01 15:50:49 -05:00
5f33cf6259 fixed run animation 2020-02-01 14:43:41 -05:00
a3e6a4e304 event controls WIP 2020-02-01 14:39:17 -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
Sweet Tini
9c18c13e8d Modify player logic to use animation parameters 2020-02-01 11:51:23 -05:00
950efeab81 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 11:44:46 -05:00
5b812bbb32 Finished event control displaying and movement 2020-02-01 11:44:43 -05:00
Sweet Tini
3b2c37d29c Add rest of basic player animations 2020-02-01 11:30:03 -05:00
9b5476d72d Added player animation to script 2020-02-01 10:29:31 -05:00
3c794540ce fixed merge 2020-02-01 09:25:02 -05:00
31528efac5 progress 2020-01-31 23:46:30 -05:00
5841f35164 progress 2020-01-31 23:23:31 -05:00
111bb5e27e in progress bug movement 2020-01-31 23:03:38 -05:00
7013b12cd8 created player movement, jump and run faster 2020-01-31 21:09:46 -05:00
137d74733b Add player and sprite placeholders 2020-01-31 19:26:52 -05:00