Commit Graph

214 Commits

Author SHA1 Message Date
OliverS 4e48a5b284 pause 2024-02-04 11:52:16 +01:00
kimrdd 786ee0b837 pause thing 2024-02-04 11:49:51 +01:00
SpoodyTheOne 98d3fc2436 Fixed mop being random 2024-02-04 11:45:45 +01:00
kimrdd 33e61d1a25 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 11:39:08 +01:00
kimrdd 8417084fe9 pause 2024-02-04 11:39:08 +01:00
OliverS abb00667e0 controller support menu 2024-02-04 11:37:29 +01:00
SpoodyTheOne 7a33995eb3 Revive text! 2024-02-04 11:35:13 +01:00
SpoodyTheOne b61de5cd28 Merge remote-tracking branch 'origin/main' 2024-02-04 11:32:15 +01:00
SpoodyTheOne eb0a259b48 Upgrades!! 2024-02-04 11:32:07 +01:00
Sveske Juice 7550cd6c19 Enemy projectile shooting 2024-02-04 02:29:04 -08:00
BOT Alex 588fba9663 Update GameScene.unity 2024-02-04 11:27:47 +01:00
BOT Alex 357f5dff65 Added minimal screenshake 2024-02-04 11:25:54 +01:00
SpoodyTheOne 4806f8f79a Merge remote-tracking branch 'origin/main' 2024-02-04 11:13:58 +01:00
SpoodyTheOne 1f7f4adcda STUFF! 2024-02-04 11:13:51 +01:00
kimrdd cb442a9acc player mop ani 2024-02-04 11:09:26 +01:00
SpoodyTheOne 3ac2466bd4 Merge remote-tracking branch 'origin/main' 2024-02-04 10:31:56 +01:00
SpoodyTheOne f4db945309 nig 2024-02-04 10:31:50 +01:00
BOT Alex 043c7142f7 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 10:25:02 +01:00
kimrdd 7612251f7e pause in progress 2024-02-04 10:24:51 +01:00
BOT Alex f54efe80be Im bouta fall asleep!!! 2024-02-04 10:24:38 +01:00
OliverS 0c65f6e965 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 10:16:15 +01:00
OliverS e0345b257f scale ui 2024-02-04 10:16:11 +01:00
SpoodyTheOne 46e292ba9e FUCK 2024-02-04 10:09:52 +01:00
SpoodyTheOne d661d14bbc game ove rscene 2024-02-04 10:08:35 +01:00
OliverS 1bab20ec5b Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 10:05:19 +01:00
OliverS 521d8a7436 gjgjgj 2024-02-04 10:05:15 +01:00
SpoodyTheOne cf815d6594 other shit 2024-02-04 10:04:07 +01:00
SpoodyTheOne 8da3b6cf35 did shit 2024-02-04 10:04:01 +01:00
OliverS adcf1b9f3e Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 10:03:34 +01:00
OliverS df22e55ef5 TutorialScene 2024-02-04 10:03:28 +01:00
SpoodyTheOne 071bd617b6 Merge remote-tracking branch 'origin/main' 2024-02-04 09:53:07 +01:00
SpoodyTheOne 162ce61132 FUCK JER 2024-02-04 09:52:47 +01:00
kimrdd 40e6f277b0 animations 2024-02-04 09:44:58 +01:00
kimrdd 5e86a91499 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 09:28:55 +01:00
kimrdd 49595cfc6e facetransition 2024-02-04 09:28:49 +01:00
BOT Alex 7bdd06ab2a Update PrefabTest.unity 2024-02-04 09:28:03 +01:00
OliverS b793cd8ab7 ui tweaks 2024-02-04 09:10:07 +01:00
OliverS b32d4cd952 fuckery 2024-02-04 09:07:05 +01:00
Sveske Juice a0c10fec3e Merge remote-tracking branch 'origin/main' 2024-02-04 00:00:45 -08:00
Sveske Juice 9411d68c1f swing trail 2024-02-04 00:00:38 -08:00
OliverS 875701c68e Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 08:40:13 +01:00
OliverS 0a142cffbc music setup 2024-02-04 08:40:08 +01:00
BOT Alex 05a8e5fd3c idk tweaks 2024-02-04 08:36:45 +01:00
Sveske Juice 6903b3602a Merge remote-tracking branch 'origin/main' 2024-02-03 23:27:56 -08:00
Sveske Juice 849f45cc0b player damages in swing attack 2024-02-03 23:27:38 -08:00
BOT Alex a5bb3c6864 Polished WaveUI 2024-02-04 08:23:13 +01:00
BOT Alex d75a0c74a6 Added audiomanager to mainmanu 2024-02-04 08:05:43 +01:00
BOT Alex 2129a89a6a Finished waveUI 2024-02-04 07:59:28 +01:00
OliverS 3140d6880e timer 2024-02-04 07:54:34 +01:00
BOT Alex 1f16c9a113 Changed ui to prefab 2024-02-04 07:33:39 +01:00
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