chyknkat
|
7ad9f98816
|
fix conficts
|
2020-02-02 11:34:03 -05:00 |
|
chyknkat
|
a6b7fde85d
|
add win and game over music
|
2020-02-02 11:32:55 -05:00 |
|
Sweet Tini
|
9a1e04997e
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 11:02:08 -05:00 |
|
Sweet Tini
|
2c4e9c3b61
|
Add parallax scrolling to level
|
2020-02-02 11:01:59 -05:00 |
|
chyknkat
|
7934402bad
|
fix conflicts
|
2020-02-02 10:37:55 -05:00 |
|
chyknkat
|
85c9f1b151
|
add fight sounds
|
2020-02-02 10:35:28 -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 |
|
Giovani
|
bc877415d9
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 10:22:01 -05:00 |
|
Jack Rus
|
3644eba86a
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 10:21:44 -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 |
|
Sweet Tini
|
fa17f5cb58
|
Add Jack Bug animation
|
2020-02-02 09:32:37 -05:00 |
|
Giovani
|
cf1c32f0bf
|
merge update
|
2020-02-02 01:28:35 -05:00 |
|
Giovani
|
26a1ede62b
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 01:28:25 -05:00 |
|
Giovani
|
6e9be66d9d
|
Fixed issue with friction on wall
|
2020-02-02 01:16:26 -05:00 |
|
Jack Rus
|
a068ffdf28
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 00:10:48 -05:00 |
|
Jack Rus
|
d1382a3c83
|
layer sorting fixes
|
2020-02-02 00:10:21 -05:00 |
|
chyknkat
|
7ac7a5db1b
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 00:04:47 -05:00 |
|
chyknkat
|
88554acb7c
|
add drink and enemy sounds
|
2020-02-02 00:04:39 -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
|
6207eff2bf
|
merge
|
2020-02-01 23:52:52 -05:00 |
|
Giovani
|
346c246554
|
Added fighting animation
|
2020-02-01 23:51:06 -05:00 |
|
Sweet Tini
|
106f5ae2e7
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 23:47:46 -05:00 |
|
Sweet Tini
|
fa681e9267
|
Add Hurt animation to player
|
2020-02-01 23:47:43 -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 |
|
chyknkat
|
f1d5b87bf2
|
add intro music
|
2020-02-01 22:42:47 -05:00 |
|
chyknkat
|
8f050574ea
|
add bug laugh
|
2020-02-01 22:15:40 -05:00 |
|
chyknkat
|
8c229d2c58
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 21:31:12 -05:00 |
|
chyknkat
|
67a425cec2
|
add scream and wrong button to assets and sound manager
|
2020-02-01 21:30:59 -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 |
|
Sweet Tini
|
a4ebbf0b85
|
Add tileset.
|
2020-02-01 20:05:47 -05:00 |
|
chyknkat
|
11bcf7e0af
|
add music
|
2020-02-01 19:42:19 -05:00 |
|
chyknkat
|
597d8c6187
|
new buttons and plus
|
2020-02-01 18:38:02 -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 |
|