Compare commits

..

170 Commits

Author SHA1 Message Date
Giovani
be1791a9e8 chore: remove link to play 2022-12-10 01:20:32 -05:00
Giovani
5c566c9d1b chore: disable compression webgl build 2021-07-03 22:48:39 -04:00
Giovani
ee7978d5d4 chore: update readme (again) 2021-07-03 22:40:44 -04:00
Giovani
3d97a42582 chore: update readme 2021-07-03 22:39:49 -04:00
Giovani
9c170db60a chore: update readme 2021-07-03 04:24:50 -04:00
Giovani
73bb67df9f feat: upgrade unity project version 2021-07-02 21:26:29 -04:00
Giovani
ad1e616f3d Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-03 09:33:58 -05:00
Giovani
42b2214cd6 changes 2020-02-03 09:33:53 -05:00
Jack Rus
1342180437 minor scene fix 2020-02-02 16:52:13 -05:00
Giovani
24b26802be Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 16:45:37 -05:00
Jack Rus
63a4871ab8 added coffee 2020-02-02 16:39:20 -05:00
Giovani
ac32881c23 changes 2020-02-02 16:28:35 -05:00
chyknkat
6f9803b996 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 16:23:33 -05:00
chyknkat
5096ef925c add sounds to intro story 2020-02-02 16:23:26 -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
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
Giovani
bc877415d9 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 10:22:01 -05:00
Jack Rus
3644eba86a Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 10:21:44 -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
Sweet Tini
fa17f5cb58 Add Jack Bug animation 2020-02-02 09:32:37 -05:00
Giovani
cf1c32f0bf merge update 2020-02-02 01:28:35 -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
Jack Rus
a068ffdf28 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 00:10:48 -05:00
Jack Rus
d1382a3c83 layer sorting fixes 2020-02-02 00:10:21 -05:00
chyknkat
7ac7a5db1b Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-02 00:04:47 -05:00
chyknkat
88554acb7c add drink and enemy sounds 2020-02-02 00:04:39 -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
6207eff2bf merge 2020-02-01 23:52:52 -05:00
Giovani
346c246554 Added fighting animation 2020-02-01 23:51:06 -05:00
Sweet Tini
106f5ae2e7 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 23:47:46 -05:00
Sweet Tini
fa681e9267 Add Hurt animation to player 2020-02-01 23:47:43 -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
chyknkat
f1d5b87bf2 add intro music 2020-02-01 22:42:47 -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
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
Sweet Tini
a4ebbf0b85 Add tileset. 2020-02-01 20:05:47 -05:00
chyknkat
11bcf7e0af add music 2020-02-01 19:42:19 -05:00
chyknkat
597d8c6187 new buttons and plus 2020-02-01 18:38:02 -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
8a25d46cdc Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 17:42:00 -05:00
Giovani
8b3e6f68bb Continued working on event controls 2020-02-01 17:41:50 -05:00
Sweet Tini
16b87b279f merge 2020-02-01 17:40:02 -05:00
Sweet Tini
b2d97043a6 Add bug fight animation 2020-02-01 17:35:21 -05:00
Giovani
c6d62ba276 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 16:24:25 -05:00
Giovani
e8638b21d1 fixed camera issue 2020-02-01 16:24:17 -05:00
Jack Rus
bd1c9889dd Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 16:23:52 -05:00
Jack Rus
7f8ff96821 landscape fixes 2020-02-01 16:23:21 -05:00
chyknkat
141ad4a3b7 update coffee 2020-02-01 16:22:14 -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
chyknkat
161190729c added plus asset 2020-02-01 15:25:45 -05:00
chyknkat
31434f7a04 add buttons asset 2020-02-01 15:12:00 -05:00
Giovani
9889dc1856 fixed run animation 2020-02-01 14:43:41 -05:00
Giovani
04e2523fba Add control 2020-02-01 14:39:57 -05:00
Giovani
a17c6048fb event controls WIP 2020-02-01 14:39:17 -05:00
Sweet Tini
a7b7061a4c Set up enemy animation and HUD elements 2020-02-01 14:37:59 -05:00
Sweet Tini
71e336def5 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 14:01:56 -05:00
Sweet Tini
804a4764cb Add Gio bug animation 2020-02-01 14:01:54 -05:00
chyknkat
a21e6fcff0 add heart asset 2020-02-01 13:37:36 -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
Sweet Tini
9a1f4d63f4 Modify player logic to use animation parameters 2020-02-01 11:51:23 -05:00
Giovani
1ac33a79d9 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 11:44:46 -05:00
Giovani
89427f7a90 Finished event control displaying and movement 2020-02-01 11:44:43 -05:00
chyknkat
f16895d02c stamina bar asset 2020-02-01 11:36:57 -05:00
Sweet Tini
5d655126cf Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 11:30:09 -05:00
Sweet Tini
a09a16a00d Add rest of basic player animations 2020-02-01 11:30:03 -05:00
chyknkat
911a3af5d1 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 10:43:51 -05:00
chyknkat
5b60491dbc add kat bug walking sprite 2020-02-01 10:43:20 -05:00
Jack Rus
abdf8add9f Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 10:38:15 -05:00
Jack Rus
e3a96f6064 landscape design 2020-02-01 10:38:09 -05:00
Sweet Tini
6fcf612824 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 10:30:54 -05:00
Sweet Tini
146de8dc81 Remove compression quality on sprites 2020-02-01 10:30:40 -05:00
Giovani
6675d33468 Added player animation to script 2020-02-01 10:29:31 -05:00
Giovani
5b849df5a7 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 09:56:21 -05:00
Giovani
3aebd39119 events control WIP 2020-02-01 09:56:08 -05:00
Sweet Tini
18cf4aedab Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 09:55:35 -05:00
Sweet Tini
5979583c5b Add basic animations 2020-02-01 09:55:33 -05:00
Jack Rus
c5701123ba Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 09:30:16 -05:00
Jack Rus
8e8f0f5a02 progress 2020-02-01 09:28:35 -05:00
Giovani
67a607602c fixed merge 2020-02-01 09:25:02 -05:00
Jack Rus
90d11ef4cb Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-02-01 09:00:24 -05:00
Jack Rus
5d8d35feed progress 2020-02-01 08:58:53 -05:00
Giovani
377a6643a8 Fixed issue with wall jump and added event controls 2020-02-01 08:58:17 -05:00
Giovani
6c77ea02c8 day one complete 2020-02-01 01:47:44 -05:00
Giovani
1f746dcab9 progress 2020-01-31 23:46:30 -05:00
Sweet Tini
46af87389f Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-01-31 23:39:39 -05:00
Sweet Tini
bcab6e7c43 Update pixel per unit to 16 2020-01-31 23:34:26 -05:00
Giovani
52fb13f96e progress 2020-01-31 23:23:31 -05:00
Giovani
8b886ba52c in progress bug movement 2020-01-31 23:03:38 -05:00
Jack Rus
eb82b505fc Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-01-31 21:21:22 -05:00
Jack Rus
a610edc143 minor 2020-01-31 21:21:14 -05:00
Giovani
4f0858d0d2 Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020 2020-01-31 21:10:05 -05:00
Giovani
833fed86f3 created player movement, jump and run faster 2020-01-31 21:09:46 -05:00
Jack Rus
c7c8c1f67d bug sprite added 2020-01-31 21:09:16 -05:00
Giovani
39af0b9d7e Add player and sprite placeholders 2020-01-31 19:26:52 -05:00
2 changed files with 1 additions and 1 deletions

View File

@@ -4,4 +4,4 @@ Fatal Exception was created by four people during the 2020 Global Game Jam using
# Demo # Demo
![gif](ggj.gif) ![gif](https://i.imgur.com/OXhwngU.gif)

BIN
ggj.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 MiB