|
|
401ae023a2
|
fixed jack bug levitating
|
2020-02-02 13:21:44 -05:00 |
|
chyknkat
|
5a443a70a6
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 13:20:30 -05:00 |
|
chyknkat
|
a81bd99ad8
|
add story music
|
2020-02-02 13:20:27 -05:00 |
|
Jack Rus
|
33f9042b2b
|
progress
|
2020-02-02 13:03:45 -05:00 |
|
|
|
3944996031
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 12:19:49 -05:00 |
|
|
|
1efd116c1f
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 12:19:35 -05:00 |
|
Jack Rus
|
4d402932ce
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 12:19:26 -05:00 |
|
Jack Rus
|
ec881f2c7c
|
new scene game over
|
2020-02-02 12:17:44 -05:00 |
|
|
|
d4cca79ab3
|
made more bugs
|
2020-02-02 12:12:11 -05:00 |
|
chyknkat
|
f65bbf2567
|
add music to game over
|
2020-02-02 11:48:50 -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
|
7512ffff69
|
fix conficts
|
2020-02-02 11:34:03 -05:00 |
|
chyknkat
|
134bf02055
|
add win and game over music
|
2020-02-02 11:32:55 -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 |
|
|
|
34fef55f67
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 10:22:01 -05:00 |
|
Jack Rus
|
7875611cba
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 10:21:44 -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 |
|
Sweet Tini
|
df2cad77b9
|
Add Jack Bug animation
|
2020-02-02 09:32:37 -05:00 |
|
|
|
a87e8ff093
|
merge update
|
2020-02-02 01:28:35 -05:00 |
|
|
|
6c390252fa
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 01:28:25 -05:00 |
|
|
|
e39ea0197d
|
Fixed issue with friction on wall
|
2020-02-02 01:16:26 -05:00 |
|
Jack Rus
|
90e3b877ef
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 00:10:48 -05:00 |
|
Jack Rus
|
c5c909a59e
|
layer sorting fixes
|
2020-02-02 00:10:21 -05:00 |
|
chyknkat
|
a7f4b807f3
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 00:04:47 -05:00 |
|
chyknkat
|
6f2196aa81
|
add drink and enemy sounds
|
2020-02-02 00:04:39 -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 |
|
|
|
fd246fb6fc
|
merge
|
2020-02-01 23:52:52 -05:00 |
|
|
|
79812da2c5
|
Added fighting animation
|
2020-02-01 23:51:06 -05:00 |
|
Sweet Tini
|
2910f5548d
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 23:47:46 -05:00 |
|
Sweet Tini
|
457d3c6a50
|
Add Hurt animation to player
|
2020-02-01 23:47:43 -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 |
|
chyknkat
|
d940ad88dd
|
add intro music
|
2020-02-01 22:42:47 -05:00 |
|
chyknkat
|
7b9073457d
|
add bug laugh
|
2020-02-01 22:15:40 -05:00 |
|
chyknkat
|
c30fbb95d6
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 21:31:12 -05:00 |
|
chyknkat
|
c801dbbec6
|
add scream and wrong button to assets and sound manager
|
2020-02-01 21:30:59 -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 |
|
