Sveskejuice/fgm24
Sveskejuice
/
fgm24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
400 Commits 3 Branches 0 Tags 70 MiB
Commit Graph

394 Commits

Author SHA1 Message Date
Sveske Juice 4e8464a52d Merge remote-tracking branch 'origin/main' 2024-02-29 15:45:06 +01:00
Sveske Juice 925934ccda Display rope on client (We need to implement client prediction and reconciliation for rope) 2024-02-29 15:41:53 +01:00
BOT Alex 23c9b80b61 minor change 2024-02-29 12:15:48 +01:00
Sveske_Juice bbbe287c1d Rope now only simulated on server 2024-02-28 20:25:01 +01:00
BOTAlex a5e033535e Enemies now only spawning on server 2024-02-28 19:27:24 +01:00
BOTAlex f203b6d710 Started server-sided rope 2024-02-28 18:59:39 +01:00
BOT Alex 4b228771e5 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-28 14:50:20 +01:00
BOT Alex 792b5407d2 Rope now connects on join 2024-02-28 14:50:14 +01:00
Sveske Juice 05ace5aea3 network player flip 2024-02-27 21:21:39 +01:00
Sveske Juice e98dd018bb Rope test 2024-02-27 21:17:44 +01:00
BOT Alex 8a4a50bd67 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-27 21:04:35 +01:00
BOT Alex fb8eee4bdc Cameras now follows players 2024-02-27 21:04:26 +01:00
Sveske Juice 2315d2241e Spawn rope 2024-02-27 20:37:15 +01:00
BOT Alex a2fcdb9d07 QuickPatch 2024-02-27 20:29:37 +01:00
BOT Alex 801dcd3d66 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24 2024-02-27 20:18:39 +01:00
BOT Alex 9a2538c772 Players now registers themselvs to gamemanager 2024-02-27 20:18:17 +01:00
Sveske Juice a076f5000f Refactor rope simulator 2024-02-27 19:54:10 +01:00
BOT Alex f1c39f502c Imported TMP again 2024-02-27 18:45:30 +01:00
BOT Alex 90e3fdd550 Unity version bump 2024-02-27 18:38:16 +01:00
BOT Alex 48b92c3705 Merge branch 'main' into Netcode 2024-02-27 18:28:12 +01:00
BOT Alex 8a3c164169 Players now move unsynced 2024-02-27 18:27:37 +01:00
BOTAlex c590bc893f Multiplayer now joinable!!! NO ERRORS ON JOIN!!! 2024-02-20 03:19:28 +01:00
BOTAlex 32f5f27201 rope rebuild giving errors 2024-02-15 01:32:08 +01:00
BOTAlex 5fb3197aba I'm soo close to online multiplayer. I can almost taste it! 2024-02-14 16:29:24 +01:00
BOTAlex 91b3c89657 Imported ParallelSync 2024-02-14 15:34:22 +01:00
Sveske_Juice b1cda4f602 Get ropejoints from players and init rope 2024-02-14 14:45:38 +01:00
Sveske_Juice ae60d7b1b4 Build rope from code 2024-02-14 14:37:29 +01:00
BOTAlex c0d9c685ca Progress on gmae setup script 2024-02-14 05:37:52 +01:00
BOTAlex 81862a21f0 Small changes (Orginized scripts into assembly definitions) 2024-02-14 04:30:38 +01:00
SpoodyTheOne e1e1f9d303 CRIPstal done 2024-02-09 12:24:42 +01:00
SpoodyTheOne b0ddba4661 blood crystal n shit 2024-02-09 11:25:50 +01:00
SpoodyTheOne 2a497e709b Tweaked upgrade prices and fixed horrendous Upgrader.cs keyboard port 💀 2024-02-09 09:23:58 +01:00
BOTAlex a40308bcbc sync because i forgor 💀 2024-02-09 04:09:08 +01:00
BOTAlex 581ec4ecb3 Unity auto thing 2024-02-09 02:41:39 +01:00
BOTAlex 8ca098e6af Imported old playerspawner script and applied prefab overrides 2024-02-09 02:38:39 +01:00
BOTAlex 06c6c578a2 Disable and reanble through script face-in image 2024-02-09 02:24:02 +01:00
BOTAlex 7ad364eb7a Fixed errors and improved scripts. Players now able to join lobby and start ggame 2024-02-09 02:19:19 +01:00
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