Giovani
|
08a2fe1736
|
some changes
|
2020-02-02 16:17:20 -05:00 |
|
Sweet Tini
|
5b6c656e1f
|
Commit to complete merge.
|
2020-02-02 16:03:10 -05:00 |
|
Sweet Tini
|
fd834e6c8c
|
Finish game intro cutscene
|
2020-02-02 16:01:40 -05:00 |
|
Giovani
|
2dcda874c4
|
level design
|
2020-02-02 15:53:52 -05:00 |
|
Giovani
|
efb32ab11b
|
stamina and health fix
|
2020-02-02 15:26:50 -05:00 |
|
Giovani
|
ef1c624876
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 15:16:31 -05:00 |
|
Giovani
|
8150f2f43e
|
fixe collectibles
|
2020-02-02 15:16:13 -05:00 |
|
Sweet Tini
|
c156f28c29
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 15:04:22 -05:00 |
|
Sweet Tini
|
afedac72cf
|
Building game intro sequence.
|
2020-02-02 15:03:58 -05:00 |
|
Giovani
|
2d1ca4bad5
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 15:00:38 -05:00 |
|
Giovani
|
52cd45f441
|
added button animation
|
2020-02-02 15:00:34 -05:00 |
|
chyknkat
|
511bde20ee
|
change sound levels
|
2020-02-02 14:25:49 -05:00 |
|
Giovani
|
90ccb6690c
|
changes
|
2020-02-02 13:41:52 -05:00 |
|
Giovani
|
e0f425fed2
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 13:22:51 -05:00 |
|
Giovani
|
7798ab67f9
|
fixed jack bug levitating
|
2020-02-02 13:21:44 -05:00 |
|
chyknkat
|
c216c146eb
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 13:20:30 -05:00 |
|
chyknkat
|
f25101ba10
|
add story music
|
2020-02-02 13:20:27 -05:00 |
|
Jack Rus
|
e7ed627314
|
progress
|
2020-02-02 13:03:45 -05:00 |
|
Giovani
|
a5694bbf06
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 12:19:35 -05:00 |
|
Giovani
|
ccbfbfb889
|
made more bugs
|
2020-02-02 12:12:11 -05:00 |
|
Jack Rus
|
ae8d8db1ee
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 11:38:59 -05:00 |
|
Jack Rus
|
2828151a30
|
game over scene
|
2020-02-02 11:35:23 -05:00 |
|
chyknkat
|
a6b7fde85d
|
add win and game over music
|
2020-02-02 11:32:55 -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
|
5ab2269ae5
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 10:32:16 -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
|
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 |
|
chyknkat
|
88554acb7c
|
add drink and enemy sounds
|
2020-02-02 00:04:39 -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
|
71ac507ab9
|
Continued working on event controls
|
2020-02-01 22:45:05 -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 |
|
Jack Rus
|
19844c0379
|
completed health and stamikna script
|
2020-02-01 20:32:24 -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 |
|
Giovani
|
a776ef3c17
|
fixed issues with player
|
2020-02-01 15:50:49 -05:00 |
|
Giovani
|
9889dc1856
|
fixed run animation
|
2020-02-01 14:43:41 -05:00 |
|
Giovani
|
a17c6048fb
|
event controls WIP
|
2020-02-01 14:39:17 -05:00 |
|
Giovani
|
9a6f7f7a37
|
Finished making successful path for event controls
|
2020-02-01 13:27:07 -05:00 |
|
Sweet Tini
|
38bdbfff40
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 11:51:34 -05:00 |
|