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 |
|
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 |
|
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 |
|
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
|
cf1c32f0bf
|
merge update
|
2020-02-02 01:28:35 -05:00 |
|
Giovani
|
6e9be66d9d
|
Fixed issue with friction on wall
|
2020-02-02 01:16:26 -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
|
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
|
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 |
|
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 |
|
chyknkat
|
11bcf7e0af
|
add music
|
2020-02-01 19:42:19 -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 |
|
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 |
|
Jack Rus
|
7f8ff96821
|
landscape fixes
|
2020-02-01 16:23:21 -05:00 |
|
Giovani
|
1e05c787ac
|
merge
|
2020-02-01 15:59:22 -05:00 |
|
Giovani
|
8bfcae21d8
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 15:58:02 -05:00 |
|
Giovani
|
a776ef3c17
|
fixed issues with player
|
2020-02-01 15:50:49 -05:00 |
|
Jack Rus
|
02900a15f3
|
Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
|
2020-02-01 15:50:24 -05:00 |
|
Jack Rus
|
da4430ad4c
|
landscape - almost done
|
2020-02-01 15:46:38 -05:00 |
|