|
|
e65ae28903
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 13:43:19 -05:00 |
|
|
|
b0f14d6f98
|
changes
|
2020-02-02 13:41:52 -05:00 |
|
Jack Rus
|
0598179ff3
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 13:39:17 -05:00 |
|
Jack Rus
|
7c85fdd17f
|
new coffee animation
|
2020-02-02 13:38:11 -05:00 |
|
|
|
d56af3e3e3
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 13:22:51 -05:00 |
|
|
|
401ae023a2
|
fixed jack bug levitating
|
2020-02-02 13:21:44 -05:00 |
|
Jack Rus
|
33f9042b2b
|
progress
|
2020-02-02 13:03:45 -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 |
|
Sweet Tini
|
682b2159ad
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 11:02:08 -05:00 |
|
Sweet Tini
|
e372a00d84
|
Add parallax scrolling to level
|
2020-02-02 11:01:59 -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 |
|
|
|
b93b0f7cfe
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 10:33:06 -05:00 |
|
|
|
16d9e40638
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 10:32:16 -05:00 |
|
Jack Rus
|
508204b3b8
|
minor fixes for sorting layers
|
2020-02-02 10:31:47 -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 |
|
|
|
a87e8ff093
|
merge update
|
2020-02-02 01:28:35 -05:00 |
|
|
|
e39ea0197d
|
Fixed issue with friction on wall
|
2020-02-02 01:16:26 -05:00 |
|
Jack Rus
|
1d02c56737
|
merge
|
2020-02-01 23:56:01 -05:00 |
|
Jack Rus
|
e4b46c25cd
|
completed landscape
|
2020-02-01 23:53:18 -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 |
|
|
|
9aca11b57b
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 22:45:18 -05:00 |
|
|
|
30c965ddc4
|
Continued working on event controls
|
2020-02-01 22:45:05 -05:00 |
|
Jack Rus
|
a0c56f41bf
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 22:45:02 -05:00 |
|
Jack Rus
|
ba5a2ebf9e
|
new tile map
|
2020-02-01 22:44:45 -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 |
|
Sweet Tini
|
4f4f374658
|
Add stamina bar piece
|
2020-02-01 20:50:30 -05:00 |
|
Jack Rus
|
0173c229f9
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 20:32:28 -05:00 |
|
Jack Rus
|
0f76de2938
|
completed health and stamikna script
|
2020-02-01 20:32:24 -05:00 |
|
chyknkat
|
8fbae5384d
|
add music
|
2020-02-01 19:42:19 -05:00 |
|
Jack Rus
|
b74112993e
|
completed landscape
|
2020-02-01 18:00:20 -05:00 |
|
Jack Rus
|
714c6fcd49
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 17:47:54 -05:00 |
|
Jack Rus
|
77a896bd44
|
progress landscape
|
2020-02-01 17:42:34 -05:00 |
|
|
|
080bfadb7a
|
Continued working on event controls
|
2020-02-01 17:41:50 -05:00 |
|
|
|
2cbc3e965d
|
fixed camera issue
|
2020-02-01 16:24:17 -05:00 |
|
Jack Rus
|
f36312f9f6
|
landscape fixes
|
2020-02-01 16:23:21 -05:00 |
|
|
|
87dbaae212
|
merge
|
2020-02-01 15:59:22 -05:00 |
|
|
|
7b2ea7d2c0
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 15:58:02 -05:00 |
|
|
|
03cb2ece8b
|
fixed issues with player
|
2020-02-01 15:50:49 -05:00 |
|
Jack Rus
|
7993d7c2b8
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 15:50:24 -05:00 |
|
Jack Rus
|
281685f3bb
|
landscape - almost done
|
2020-02-01 15:46:38 -05:00 |
|
