Commit Graph

400 Commits

Author SHA1 Message Date
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
SpoodyTheOne 402df68975 Merge remote-tracking branch 'origin/main' 2024-02-04 09:29:56 +01:00
SpoodyTheOne a70473e7e8 Bloodmanager now has seperate values for blood mopped for both players 2024-02-04 09:29:52 +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
BOT Alex 37a75b5c15 Sync 2024-02-04 09:27:46 +01:00
Sveske Juice ff0ee1a1b6 L 2024-02-04 00:24:51 -08:00
kimrdd 2708deb2b9 fade not done 2024-02-04 09:19:18 +01:00
SpoodyTheOne 54b6c3115c fuck 2024-02-04 09:12:58 +01:00
SpoodyTheOne 3cc55a9b74 Merge remote-tracking branch 'origin/main' 2024-02-04 09:12:16 +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
BOT Alex 1773acb3ef Added disabling of rumble 2024-02-04 08:50:27 +01: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 26958be925 Merge remote-tracking branch 'origin/main' 2024-02-03 23:35:16 -08:00
Sveske Juice e10e52248d fix font warning, minor adjustment 2024-02-03 23:35:08 -08:00
OliverS 6690ff0b44 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 08:28:53 +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
OliverS ae415cc858 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 08:20:55 +01:00
BOT Alex 3d1f783f19 Added stop all Audio 2024-02-04 08:19:38 +01:00
OliverS 5367994b77 adui 2024-02-04 08:16:54 +01:00
BOT Alex d75a0c74a6 Added audiomanager to mainmanu 2024-02-04 08:05:43 +01:00
BOT Alex 1c10e953f8 Tried to finish WaveUI 2024-02-04 08:04:26 +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
OliverS 7233b1054e Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 07:49:49 +01:00
BOT Alex 2fc1c61e27 Started WAveUI 2024-02-04 07:49:39 +01:00
OliverS 911ea891df Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 07:39:59 +01:00
BOT Alex 62295cb0cf Applied all overrides 2024-02-04 07:35:52 +01:00
BOT Alex 1f16c9a113 Changed ui to prefab 2024-02-04 07:33:39 +01:00
BOT Alex 793733b81a Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 07:16:14 +01:00
BOT Alex d6ee4f477a A nice amount of difficulty increase 2024-02-04 07:16:08 +01:00
Sveske Juice 85af588eac Merge remote-tracking branch 'origin/main' 2024-02-03 22:15:29 -08:00
Sveske Juice b07650b7f0 more damage when swinging 2024-02-03 22:15:21 -08:00
BOT Alex 4c1ad8e585 Removed old debug.log 2024-02-04 06:57:12 +01:00
BOT Alex 678eb955c7 Scaling back some rubmling 2024-02-04 06:53:35 +01:00
BOT Alex 71c1471a4e Now ignoring this error 2024-02-04 06:51:07 +01:00