Commit Graph

394 Commits

Author SHA1 Message Date
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
BOT Alex 31aeb72f27 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 06:50:38 +01:00
BOT Alex ca210eed69 Added more rumbling!!! 2024-02-04 06:50:33 +01:00
Sveske Juice 434c2e84cf rm dbg 2024-02-03 21:37:43 -08:00
Sveske Juice 629fe00866 rope pull 2024-02-03 21:36:04 -08:00
Sveske Juice 6dcf165a94 pull animation 2024-02-03 21:27:28 -08: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
kimrdd 4706818ca4 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 05:05:59 +01:00
kimrdd e269c0920a try runble 2024-02-04 05:05:52 +01:00
BOT Alex 145fe769fb Update PlayerMovement.cs 2024-02-04 04:56:53 +01: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
SpoodyTheOne 3576b9c942 Merge remote-tracking branch 'origin/main' 2024-02-04 03:25:19 +01:00
SpoodyTheOne a33af23270 Playro dmange and gmage mananger 2024-02-04 03:25:01 +01:00
OliverS 92218e2f68 splash screen 2024-02-04 03:14:55 +01:00
kimrdd 157e603674 enemy RB 2024-02-04 03:08:42 +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 6b1299d394 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 02:58:18 +01:00
Sveske Juice dbef2ea752 fix err 2024-02-03 17:57:37 -08:00
kimrdd 2d12abe695 Enemy Animation fixes 2024-02-04 02:57:34 +01:00
Sveske Juice b6be35168e Merge remote-tracking branch 'origin/main' 2024-02-03 17:56:16 -08:00
Sveske Juice 52cdc284ba l 2024-02-03 17:56:12 -08:00
kimrdd 000d1e6b0e enemy hp customization 2024-02-04 02:53:32 +01:00
OliverS b1f6b2fc04 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 02:52:13 +01:00
OliverS e779649fb5 pillar import 2024-02-04 02:52:05 +01:00
SpoodyTheOne 6f510ebeaa Merge remote-tracking branch 'origin/main' 2024-02-04 02:49:38 +01:00
kimrdd 62e8769965 error fix 2024-02-04 02:48:52 +01:00
SpoodyTheOne 6517c26fc3 Added upgrade descriptions to upgrader 2024-02-04 02:45:51 +01:00
BOT Alex b1e67478f6 Converted some ojbects to prefabs 2024-02-04 02:40:16 +01:00
OliverS 728ca8f99e Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 02:38:49 +01:00
OliverS bbde7bde04 ui setup 2024-02-04 02:38:42 +01:00
kimrdd 4e4c4eff5d Animation tweaks and enemy tag 2024-02-04 02:36:52 +01:00
kimrdd e0e2e1c6d7 Animation tweaks and enemy tag 2024-02-04 02:34:23 +01:00
Sveske Juice e6ba08e34a Merge remote-tracking branch 'origin/main' 2024-02-03 17:26:19 -08:00
Sveske Juice 5dc812c55f Fixed blood and also made blood better 2024-02-03 17:26:11 -08:00
BOT Alex adfadafb50 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 02:21:03 +01:00
BOT Alex 6e3aee1811 Update FootStepSounder.cs 2024-02-04 02:20:57 +01:00
OliverS b80c9d960f Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 02:20:31 +01:00
OliverS 8277314729 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 02:20:09 +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
Sveske Juice 8f7d31d742 Merge remote-tracking branch 'origin/main' 2024-02-03 17:11:46 -08:00
Sveske Juice fdd5a5d3a3 damage text white orange red 2024-02-03 17:11:43 -08: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
BOT Alex 2bfe79358b Imported sounds 2024-02-04 01:41:00 +01:00
Sveske Juice c565a38cc9 Merge remote-tracking branch 'origin/main' 2024-02-03 16:37:37 -08:00
BOT Alex 2790611e58 Update EnemySpawner.cs 2024-02-04 01:35:04 +01:00
Sveske Juice 5f00412d5e Merge remote-tracking branch 'origin/main' 2024-02-03 16:26:05 -08:00
Sveske Juice 85cb42fd63 Damage numbers 2024-02-03 16:25:59 -08:00
BOT Alex 7800d171e7 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 01:25:10 +01:00
BOT Alex 8c3f17dccd Update CameraRig.prefab 2024-02-04 01:25:04 +01:00
SpoodyTheOne a50a807939 Better blood and fixed upgrades 2024-02-04 00:48:43 +01:00
SpoodyTheOne 4f12551e8f Bood 2024-02-04 00:41:24 +01:00
SpoodyTheOne 6c8750768b Added random vel to blood 2024-02-04 00:39:58 +01:00
Sveske Juice fc295808e9 Merge remote-tracking branch 'origin/main' 2024-02-03 15:32:29 -08:00
OliverS 822007c80b Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 00:27:05 +01:00
BOT Alex 52b8a8ccff I hope i fixed first wave spawn 2024-02-04 00:26:32 +01:00
Sveske Juice df3515e5e9 player health bar 2024-02-03 15:19:46 -08:00
BOT Alex d78cb670c2 Fixed player sprite anim 2024-02-04 00:19:01 +01:00
BOT Alex d107a523e9 Update CameraRig.prefab 2024-02-04 00:17:12 +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 23c33488dd enemy animations not done 2024-02-04 00:08:25 +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
BOT Alex 3baa6c5d25 Fixed spawner errors 2024-02-03 23:22:55 +01:00
Sveske Juice f5bea512ef Health bar correctly working 2024-02-03 14:11:53 -08:00
BOT Alex 44c7d42d17 camera fix? 2024-02-03 23:10:49 +01:00
BOT Alex d1a66e7f79 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 22:55:13 +01:00
BOT Alex 04e1f61f8b Stopped camera from being too small 2024-02-03 22:55:06 +01: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 e2fb134323 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 22:42:59 +01:00
kimrdd 652f25aa85 Ground- in pro 2024-02-03 22:42:50 +01:00
BOT Alex dc398009a9 uncommented randomenemyspawn method 2024-02-03 22:36:28 +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 61c1c81dd5 Enemies have blood. ANd also health bars ig 2024-02-03 13:18:28 -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 ff8b050d93 Backup (animation speed and custom) 2024-02-03 21:46:48 +01:00
kimrdd ca49e7955a Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 21:46:15 +01:00
BOT Alex 364aaced8b Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 21:44:56 +01:00
BOT Alex b2da2e48b3 Added sprite flipping by movement script 2024-02-03 21:44:51 +01:00
Sveske Juice 62afc25653 zhen zync 2024-02-03 12:38:42 -08:00
BOT Alex 3ad9042702 Seperated keyboard movement 2024-02-03 21:35:06 +01:00
kimrdd 4cccb5218a Enemy animations working 2024-02-03 21:31:14 +01:00
SpoodyTheOne e98baf5b9f Removed debug.log 2024-02-03 21:25:23 +01:00
SpoodyTheOne 77b979913e Upgrade menu done 2024-02-03 21:22:37 +01:00
kimrdd 15aab30262 WalkAnimationsToAllEnemies 2024-02-03 21:21:09 +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 1877969952 Added menu iconography to upgrade menu 2024-02-03 20:52:55 +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 a6e8eb31d3 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 11:15:22 -08:00
BOT Alex ebf4b0e982 Player now turns to their move direction 2024-02-03 20:04:50 +01:00
Sveske Juice e971b101b4 Rope shrink extend done 2024-02-03 11:01:12 -08:00
OliverS cd20189a2c Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 19:52:33 +01:00
OliverS e7d4435219 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 19:52:11 +01:00
BOT Alex f7258e4668 Started running particles 2024-02-03 19:52:08 +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
BOT Alex 9620498dab MainMenu transition change scene 2024-02-03 18:02:20 +01:00
kimrdd cc632eec45 Level design progres ~30% 2024-02-03 17:48:41 +01:00
BOT Alex a43b040676 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 17:33:51 +01:00
BOT Alex 865777111d Finished enemySpawner 2024-02-03 17:33:45 +01:00
Sveske Juice e1a44344fe rebuild rope on shrink extend WIP 2024-02-03 07:58:14 -08:00
SpoodyTheOne b2e26ce8d2 upegurador! 2024-02-03 16:22:10 +01:00
Sveske Juice 15e045a26c shrink extend WIP 2024-02-03 07:21:32 -08:00
kimrdd dd9b264927 gg 2024-02-03 15:45:11 +01:00
kimrdd 99e6b8c519 Error fix 2024-02-03 15:21:45 +01:00
Sveske Juice 720428c739 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-03 06:03:40 -08:00
Sveske Juice 9dea78edb7 natural whip swing 2024-02-03 06:03:38 -08:00
kimrdd 4b8f5fee0f All enemy prefabs Done 2024-02-03 14:35:16 +01:00
SpoodyTheOne 42d978575e Merge remote-tracking branch 'origin/main' 2024-02-03 14:23:10 +01:00
Sveske Juice e3f54b785a enemy multiple target support & enemy stop when being squezed 2024-02-03 05:22:59 -08:00
SpoodyTheOne c9ca60b19f Added basic sound manager 2024-02-03 14:22:53 +01:00
Sveske Juice 49360ba4e8 basic rope whip attack 2024-02-03 05:07:03 -08:00
kimrdd d625572365 naming all enemies and its animations 2024-02-03 13:37:56 +01:00