Commit Graph

214 Commits

Author SHA1 Message Date
BOT Alex ca210eed69 Added more rumbling!!! 2024-02-04 06:50:33 +01:00
BOT Alex c97c58c400 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 06:13:24 +01:00
BOT Alex 74adab7b52 Added vibration manager 2024-02-04 06:12:13 +01:00
Sveske Juice dd827bee2f Merge remote-tracking branch 'origin/main' 2024-02-03 20:50:16 -08:00
Sveske Juice d2830b8e59 rope pull animation 2024-02-03 20:40:23 -08:00
BOT Alex f927a71fab Sync 2024-02-04 04:56:01 +01:00
kimrdd dce16ef235 music stuff 2024-02-04 04:48:33 +01:00
kimrdd 205b507cb4 Enemy animations and health amount tweak done 2024-02-04 04:16:09 +01:00
kimrdd f23fd47b18 enemy animations almost done 2024-02-04 04:04:25 +01:00
kimrdd 34238a6630 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 04:04:08 +01:00
BOT Alex dfe3685e06 Rope sound done. Good enough 2024-02-04 04:03:19 +01:00
kimrdd 10e8167b12 enemy animations fixes 2024-02-04 03:07:44 +01:00
SpoodyTheOne 952abb457a Merge remote-tracking branch 'origin/main' 2024-02-04 02:58:37 +01:00
SpoodyTheOne 5504771236 Bluh 2024-02-04 02:58:23 +01:00
kimrdd 000d1e6b0e enemy hp customization 2024-02-04 02:53:32 +01:00
BOT Alex b1e67478f6 Converted some ojbects to prefabs 2024-02-04 02:40:16 +01:00
OliverS bbde7bde04 ui setup 2024-02-04 02:38:42 +01:00
OliverS b80c9d960f Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 02:20:31 +01:00
BOT Alex 32459bec81 Added footsteps 2024-02-04 02:20:08 +01:00
OliverS af81f33e6b post processing 2024-02-04 02:19:46 +01:00
kimrdd 6eb226b015 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 02:02:59 +01:00
BOT Alex af16d0f340 Moved audio 2024-02-04 01:49:22 +01:00
BOT Alex 464596ae30 Added managers prefab 2024-02-04 01:47:19 +01:00
SpoodyTheOne 4f12551e8f Bood 2024-02-04 00:41:24 +01:00
OliverS 822007c80b Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 00:27:05 +01:00
BOT Alex d78cb670c2 Fixed player sprite anim 2024-02-04 00:19:01 +01:00
BOT Alex 0be229e41b Tweaked spawning speed 2024-02-04 00:16:27 +01:00
kimrdd c009d76758 ground layering 2024-02-04 00:12:16 +01:00
kimrdd 03e3f62a2e Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 00:09:00 +01:00
BOT Alex 6f4cb67186 Starts spawning enemies faster 2024-02-04 00:08:51 +01:00
kimrdd 1ad0336c54 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 00:08:11 +01:00
BOT Alex 9c40dec24f Fixed camera rotation 2024-02-04 00:04:21 +01:00
kimrdd 3ce875f924 walls? 2024-02-03 23:51:18 +01:00
OliverS 2ddd79e931 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 23:48:30 +01:00
OliverS 0070525359 damagepopup 2024-02-03 23:48:04 +01:00
kimrdd 841568c2dd bslls 2024-02-03 23:48:00 +01:00
BOT Alex 258bbbdd43 Tweaked camera 2024-02-03 23:45:44 +01:00
BOT Alex 82fadb0dd2 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 23:42:33 +01:00
BOT Alex 4f23d59b43 Tweaked enemy waves 2024-02-03 23:42:29 +01:00
kimrdd 6a5308f9eb LayerFix? 2024-02-03 23:38:41 +01:00
Sveske Juice e3ce9cfcbc blood vfx size 2024-02-03 14:32:01 -08:00
kimrdd b2a53ca1b5 Ground Prefab (Design) 2024-02-03 23:24:25 +01:00
Sveske Juice f5bea512ef Health bar correctly working 2024-02-03 14:11:53 -08:00
Sveske Juice 3540b144c0 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 13:46:32 -08:00
Sveske Juice 36a17ddeb1 health bar 2024-02-03 13:46:24 -08:00
BOT Alex 12b5281f4e Fixed blod orientation 2024-02-03 22:45:15 +01:00
BOT Alex 0c237469f4 Converted camera rig to prefab 2024-02-03 22:44:24 +01:00
kimrdd 652f25aa85 Ground- in pro 2024-02-03 22:42:50 +01:00
kimrdd 5ad484f57d Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 22:32:09 +01:00
BOT Alex 9b24f85783 Added enemySpawner 2024-02-03 22:31:54 +01:00
kimrdd 9b7ddaec94 WallColliders 2024-02-03 22:29:16 +01:00
Sveske Juice 955f098790 blood fbx fix 2024-02-03 13:26:04 -08:00
Sveske Juice 0381f9cc90 import blod system upgrade game scene 2024-02-03 13:05:01 -08:00
Sveske Juice d1f6d61fbb import camerea controller to game scene 2024-02-03 12:59:23 -08:00
kimrdd a897dd65dc Enemy flip add 2024-02-03 21:52:24 +01:00
kimrdd 4cccb5218a Enemy animations working 2024-02-03 21:31:14 +01:00
SpoodyTheOne 77b979913e Upgrade menu done 2024-02-03 21:22:37 +01:00
BOT Alex 1257b134d3 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 21:04:35 +01:00
BOT Alex 657a4cf29b Added cinemachine thing 2024-02-03 21:04:21 +01:00
SpoodyTheOne 325cf8e7bc Finished upgrader 2024-02-03 20:43:17 +01:00
Sveske Juice 42fa9de511 Add players and rope to game scene 2024-02-03 11:32:15 -08:00
Sveske Juice 30233a2347 expose rope squeze damage & update rope texture 2024-02-03 11:15:38 -08:00
Sveske Juice e971b101b4 Rope shrink extend done 2024-02-03 11:01:12 -08:00
OliverS e7d4435219 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 19:52:11 +01:00
OliverS 2fd4eaa2b1 Main Menu update 2024-02-03 19:51:05 +01:00
kimrdd c64fc549cb NavMesh 2024-02-03 19:38:24 +01:00
SpoodyTheOne ef458502f0 Added ui hand art 2024-02-03 19:08:44 +01:00
kimrdd 8c925d8f99 sync 2024-02-03 18:28:29 +01:00
SpoodyTheOne dd2733a506 Upgrader done 2024-02-03 18:07:52 +01:00
kimrdd 17be113edc Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 18:02:43 +01:00
kimrdd cc632eec45 Level design progres ~30% 2024-02-03 17:48:41 +01:00
Sveske Juice e1a44344fe rebuild rope on shrink extend WIP 2024-02-03 07:58:14 -08:00
Sveske Juice 15e045a26c shrink extend WIP 2024-02-03 07:21:32 -08:00
kimrdd 99e6b8c519 Error fix 2024-02-03 15:21:45 +01:00
kimrdd 4b8f5fee0f All enemy prefabs Done 2024-02-03 14:35:16 +01:00
Sveske Juice e3f54b785a enemy multiple target support & enemy stop when being squezed 2024-02-03 05:22:59 -08:00
Sveske Juice 49360ba4e8 basic rope whip attack 2024-02-03 05:07:03 -08:00
SpoodyTheOne 825761ea81 Added sound to blood and cleaning 2024-02-03 13:32:30 +01:00
kimrdd ca3de70787 import enemies 2024-02-03 13:31:39 +01:00
kimrdd 258888766f player 1 animations 2024-02-03 13:07:46 +01:00
Sveske Juice f677a2ec82 Connect rope between players 2024-02-03 03:42:00 -08:00
SpoodyTheOne 2f001ef815 Merge remote-tracking branch 'origin/main' 2024-02-03 12:23:38 +01:00
SpoodyTheOne 162869b970 Merge 2024-02-03 12:22:55 +01:00
kimrdd 7d139bb87c animation player almost done 2024-02-03 12:21:41 +01:00
kimrdd 096da18742 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 11:43:19 +01:00
kimrdd b4bd37842c sync 2024-02-03 11:42:50 +01:00
Sveske Juice dea62cbe2a Fix player collider not fucking rope up 2024-02-03 02:20:09 -08:00
kimrdd 63ce875dfc Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 11:06:55 +01:00
kimrdd 70b7a727d7 animation 2 2024-02-03 11:06:27 +01:00
Sveske Juice 14f78873ef fix rope multiple colliders 2024-02-03 01:57:18 -08:00
kimrdd 94a871d706 animation 1 2024-02-03 10:52:24 +01:00
kimrdd 1429133624 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 03:38:45 +01:00
kimrdd 3da83d43b9 sync 2024-02-03 03:38:38 +01:00
Sveske Juice e60f6c717c rope texturing 2024-02-02 18:29:37 -08:00
kimrdd 56bd4edde9 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 03:28:32 +01:00
kimrdd 936efbc2eb projectile attack 2024-02-03 03:28:29 +01:00
Sveske Juice 8b10b735c9 rope with gravity effect 2024-02-02 17:47:40 -08:00
kimrdd aff0d01fc6 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 01:41:49 +01:00
kimrdd 5134309026 prejectile try (not complete) 2024-02-03 01:41:20 +01:00
Sveske Juice 0f44990843 simple line renderer 2024-02-02 16:25:34 -08:00
Sveske Juice cca6af8109 squeze damage from rope 2024-02-02 16:14:34 -08:00
kimrdd e87e5c76b7 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 00:34:13 +01:00
kimrdd 0bb8724a3c MainMenuAnimation 2024-02-03 00:34:11 +01:00
Sveske Juice d781aace61 rope physics 2024-02-02 15:15:07 -08:00
kimrdd ab098c3370 PathFinding done 2024-02-02 23:21:12 +01:00
OliverS f31b2b900f Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-02 22:45:09 +01:00
kimrdd 3a7f742f7d Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-02 22:43:51 +01:00
kimrdd aaa20a64d5 controller stuff 2024-02-02 22:43:39 +01:00
OliverS ae3384a7a0 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-02 22:41:53 +01:00
OliverS c286decf64 main menu setup 2024-02-02 22:41:47 +01:00
Sveske Juice 692cbf4d10 extensions 2024-02-02 12:03:21 -08:00
kimrdd 7b8222da45 sync 2024-02-02 20:26:17 +01:00
kimrdd c7964751a3 TMP Health and movement 2024-02-02 20:05:03 +01:00
kimrdd 29686e324b unity 2024-02-02 19:31:47 +01:00