Sweet Tini
|
3d19fa6243
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 16:12:28 -05:00 |
|
|
|
11b1d4e721
|
changes
|
2020-02-02 16:11:24 -05:00 |
|
|
|
0dd1d0f87a
|
last changes
|
2020-02-02 16:10:45 -05:00 |
|
|
|
8b6df6d828
|
merge
|
2020-02-02 16:04:06 -05:00 |
|
|
|
b3960e8d36
|
scene changes
|
2020-02-02 16:03:22 -05:00 |
|
Sweet Tini
|
837085cd9d
|
Commit to complete merge.
|
2020-02-02 16:03:10 -05:00 |
|
Jack Rus
|
d80afb6d75
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 16:01:59 -05:00 |
|
Sweet Tini
|
e9ccb280a1
|
Finish game intro cutscene
|
2020-02-02 16:01:40 -05:00 |
|
Jack Rus
|
a8919fccf6
|
added bugs
|
2020-02-02 15:59:19 -05:00 |
|
|
|
0706b3497b
|
level design
|
2020-02-02 15:53:52 -05:00 |
|
|
|
1530bf249e
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 15:27:31 -05:00 |
|
|
|
91d53ac010
|
stamina and health fix
|
2020-02-02 15:26:50 -05:00 |
|
Jack Rus
|
8ad5624675
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 15:16:55 -05:00 |
|
Jack Rus
|
add46e7203
|
progress
|
2020-02-02 15:16:44 -05:00 |
|
|
|
fca0c2ad75
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 15:16:31 -05:00 |
|
|
|
0aeea4833c
|
fixe collectibles
|
2020-02-02 15:16:13 -05:00 |
|
chyknkat
|
e37f77ef94
|
Update GameIntro.unity
|
2020-02-02 15:07:28 -05:00 |
|
Sweet Tini
|
94ace763a5
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 15:04:22 -05:00 |
|
Sweet Tini
|
87c7b5f447
|
Building game intro sequence.
|
2020-02-02 15:03:58 -05:00 |
|
Jack Rus
|
34ee0e7357
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 15:03:44 -05:00 |
|
|
|
c84faa8b58
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 15:00:38 -05:00 |
|
|
|
4ecd89e406
|
added button animation
|
2020-02-02 15:00:34 -05:00 |
|
Jack Rus
|
49696ef9fa
|
progress
|
2020-02-02 15:00:33 -05:00 |
|
chyknkat
|
c6c394343f
|
change sound levels
|
2020-02-02 14:25:49 -05:00 |
|
|
|
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 |
|
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 |
|
