Giovani
|
ac32881c23
|
changes
|
2020-02-02 16:28:35 -05:00 |
|
Giovani
|
032bd484c4
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 16:17:28 -05:00 |
|
Giovani
|
08a2fe1736
|
some changes
|
2020-02-02 16:17:20 -05:00 |
|
Jack Rus
|
da06e1ede5
|
minor
|
2020-02-02 16:16:55 -05:00 |
|
Jack Rus
|
65d8ccea82
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 16:12:56 -05:00 |
|
Jack Rus
|
8d3e9b0801
|
changed game over button
|
2020-02-02 16:12:31 -05:00 |
|
Sweet Tini
|
d08eb83fd0
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 16:12:28 -05:00 |
|
Giovani
|
a735a21c7a
|
changes
|
2020-02-02 16:11:24 -05:00 |
|
Giovani
|
fb256c1f2a
|
last changes
|
2020-02-02 16:10:45 -05:00 |
|
Giovani
|
734a868b7e
|
merge
|
2020-02-02 16:04:06 -05:00 |
|
Giovani
|
9a86fb2c19
|
scene changes
|
2020-02-02 16:03:22 -05:00 |
|
Sweet Tini
|
5b6c656e1f
|
Commit to complete merge.
|
2020-02-02 16:03:10 -05:00 |
|
Jack Rus
|
cc5fcaffe6
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 16:01:59 -05:00 |
|
Sweet Tini
|
fd834e6c8c
|
Finish game intro cutscene
|
2020-02-02 16:01:40 -05:00 |
|
Jack Rus
|
b4c75be293
|
added bugs
|
2020-02-02 15:59:19 -05:00 |
|
Giovani
|
2dcda874c4
|
level design
|
2020-02-02 15:53:52 -05:00 |
|
Giovani
|
96dacc222c
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 15:27:31 -05:00 |
|
Giovani
|
efb32ab11b
|
stamina and health fix
|
2020-02-02 15:26:50 -05:00 |
|
Jack Rus
|
c4306e180a
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 15:16:55 -05:00 |
|
Jack Rus
|
353849198f
|
progress
|
2020-02-02 15:16:44 -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 |
|
chyknkat
|
79ed558e37
|
Update GameIntro.unity
|
2020-02-02 15:07:28 -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 |
|
Jack Rus
|
1a7f679328
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 15:03:44 -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 |
|
Jack Rus
|
f934021e34
|
progress
|
2020-02-02 15:00:33 -05:00 |
|
chyknkat
|
511bde20ee
|
change sound levels
|
2020-02-02 14:25:49 -05:00 |
|
Giovani
|
a46f8e6005
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 13:43:19 -05:00 |
|
Giovani
|
90ccb6690c
|
changes
|
2020-02-02 13:41:52 -05:00 |
|
Jack Rus
|
e4a151be7e
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 13:39:17 -05:00 |
|
Jack Rus
|
e4802efeb0
|
new coffee animation
|
2020-02-02 13:38:11 -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
|
c0c961a090
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 12:19:49 -05:00 |
|
Giovani
|
a5694bbf06
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 12:19:35 -05:00 |
|
Jack Rus
|
69360c31ab
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 12:19:26 -05:00 |
|
Jack Rus
|
e73c6e5410
|
new scene game over
|
2020-02-02 12:17:44 -05:00 |
|
Giovani
|
ccbfbfb889
|
made more bugs
|
2020-02-02 12:12:11 -05:00 |
|
chyknkat
|
056c9cb83a
|
add music to game over
|
2020-02-02 11:48:50 -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
|
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 |
|