Commit Graph

147 Commits

Author SHA1 Message Date
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