Commit Graph

357 Commits

Author SHA1 Message Date
BOTAlex c4eb2ff33c Imported steamworks and fixed errors 2024-02-08 23:36:56 +01:00
BOTAlex d8bde37afd Slight scene cleanup 2024-02-08 23:29:39 +01:00
BOTAlex a846550fe0 Imported old multiplayer scripts and scenes. import netcode 2024-02-08 23:05:24 +01:00
BOTAlex 59415a34c0 Moved camera shake to scripts folder 2024-02-08 22:55:01 +01:00
spoody 25b3be6ffe CODE 2024-02-07 21:49:10 +01:00
Sveske_Juice 36215ed3e9 game logo 2024-02-06 15:23:52 +01:00
Sveske_Juice a96f00d76f final tweaks 2024-02-06 15:23:40 +01:00
Sveske_Juice b2c4949b4d Upgrade with keyboard 2024-02-06 14:53:30 +01:00
Sveske_Juice c55784ac08 Game over controller input 2024-02-06 14:32:09 +01:00
Sveske_Juice f582ea491a Keyboard controls:
Player 1:
extend: Q
shrink: E
Swing: R

Player 2:
extend: .
shrink: ,
swing: L
2024-02-06 14:21:29 +01:00
Sveske_Juice 98421cb784 Actually fix revive 2024-02-06 14:06:21 +01:00
BOT Alex eb6f1dd61f Fixed errors 2024-02-04 23:21:17 +01:00
BOT Alex 4505d4e73d Solved merge conflics 2024-02-04 23:18:40 +01:00
Sveske_Juice f9498f9d2a revive build fix 2024-02-04 17:06:35 +01:00
Sveske_Juice 916994f143 Fix revive and game over 2024-02-04 16:55:37 +01:00
Sveske_Juice 175c7ca086 Fix all errors 2024-02-04 16:32:14 +01:00
Sveske Juice a798ad9ac9 final buidæ 2024-02-04 03:05:48 -08:00
OliverS 97325abdb2 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 11:59:54 +01:00
OliverS 0d10e3727c fix 2024-02-04 11:59:49 +01:00
SpoodyTheOne d98d62d4c3 FUCK 2024-02-04 11:58:37 +01:00
BOT Alex ff6fcee62e Merge fix 2024-02-04 11:56:48 +01:00
OliverS 9236097855 ui 2024-02-04 11:53:18 +01:00
OliverS 4e48a5b284 pause 2024-02-04 11:52:16 +01:00
kimrdd bc988ab60e Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-04 11:49:52 +01:00
kimrdd 786ee0b837 pause thing 2024-02-04 11:49:51 +01:00
SpoodyTheOne f320603800 Merge remote-tracking branch 'origin/main' 2024-02-04 11:48:50 +01:00
SpoodyTheOne 89af403895 Dont tick red when positive damage 2024-02-04 11:48:46 +01:00
Sveske Juice b228433eaa fix blod regen 2024-02-04 02:48:24 -08:00
Sveske Juice e47966e8e1 Merge remote-tracking branch 'origin/main' 2024-02-04 02:47:31 -08:00
BOT Alex 84cf78921f Build settings 2024-02-04 11:46:40 +01:00
SpoodyTheOne e1e2fd9069 Merge remote-tracking branch 'origin/main' 2024-02-04 11:45:49 +01:00
SpoodyTheOne 98d3fc2436 Fixed mop being random 2024-02-04 11:45:45 +01:00
Sveske Juice 89028df5c2 w 2024-02-04 02:45:02 -08:00
BOT Alex c829d04a19 Ready unity build 2024-02-04 11:41:27 +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
BOT Alex ca80f88c55 Update HealthComponent.cs 2024-02-04 10:40:05 +01:00
BOT Alex 4dbe23fb69 Update AudioLibrary.asset 2024-02-04 10:33:41 +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
kimrdd 10e5c818ab pausedisablesfornow 2024-02-04 10:29:51 +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 6b07e3b115 Added script for returning to main menu on game over screen 2024-02-04 10:12:07 +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
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