|
|
68cd1d63dc
|
changes
|
2020-02-03 09:33:53 -05:00 |
|
|
|
b2c4010ddb
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 16:45:37 -05:00 |
|
Jack Rus
|
b00811a8b0
|
added coffee
|
2020-02-02 16:39:20 -05:00 |
|
|
|
9c6bf8eb14
|
changes
|
2020-02-02 16:28:35 -05:00 |
|
chyknkat
|
80371ff1cc
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 16:23:33 -05:00 |
|
chyknkat
|
ec4eb9d013
|
add sounds to intro story
|
2020-02-02 16:23:26 -05:00 |
|
|
|
0c270a7b62
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 16:17:28 -05:00 |
|
|
|
c162d67c79
|
some changes
|
2020-02-02 16:17:20 -05:00 |
|
Jack Rus
|
e02b302b19
|
minor
|
2020-02-02 16:16:55 -05:00 |
|
Sweet Tini
|
837085cd9d
|
Commit to complete merge.
|
2020-02-02 16:03:10 -05:00 |
|
Sweet Tini
|
e9ccb280a1
|
Finish game intro cutscene
|
2020-02-02 16:01:40 -05:00 |
|
|
|
0706b3497b
|
level design
|
2020-02-02 15:53:52 -05:00 |
|
|
|
91d53ac010
|
stamina and health fix
|
2020-02-02 15:26:50 -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 |
|
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 |
|
|
|
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 |
|
chyknkat
|
c6c394343f
|
change sound levels
|
2020-02-02 14:25:49 -05:00 |
|
|
|
b0f14d6f98
|
changes
|
2020-02-02 13:41:52 -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 |
|
|
|
1efd116c1f
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 12:19:35 -05:00 |
|
|
|
d4cca79ab3
|
made more bugs
|
2020-02-02 12:12:11 -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
|
134bf02055
|
add win and game over music
|
2020-02-02 11:32:55 -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 |
|
|
|
16d9e40638
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-02 10:32:16 -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 |
|
|
|
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 |
|
chyknkat
|
6f2196aa81
|
add drink and enemy sounds
|
2020-02-02 00:04:39 -05:00 |
|
|
|
79812da2c5
|
Added fighting animation
|
2020-02-01 23:51:06 -05:00 |
|
|
|
0e16dc5f9f
|
finally fixed player getting stuck
|
2020-02-01 23:10:39 -05:00 |
|
|
|
30c965ddc4
|
Continued working on event controls
|
2020-02-01 22:45:05 -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 |
|
chyknkat
|
e4294a01ac
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 21:09:23 -05:00 |
|
chyknkat
|
40521063e4
|
add jump sound
|
2020-02-01 21:09:17 -05:00 |
|
|
|
5ada160f60
|
fixed player bugs
|
2020-02-01 21:09:12 -05:00 |
|
