Commit Graph

167 Commits

Author SHA1 Message Date
b5ff99272b Fix 2024-12-14 11:10:34 -06:00
f1f56d52cd save changes 2024-12-14 11:48:57 -05:00
cdb55ecef1 Fix for host starting game 2024-12-14 10:48:00 -06:00
fa75860d34 save working changes 2024-12-14 01:20:41 -05:00
27cce98d46 Added start game functionality 2024-12-14 00:18:41 -06:00
c3dd861e61 Add terrain and textures for the dev level 2024-12-13 23:19:23 -05:00
1df56511fe Remove old networking code from player 2024-12-13 22:52:06 -05:00
86f6d53081 Merge pull request 'feature/moving-platforms' (#6) from feature/moving-platforms into develop
Reviewed-on: https://git.bellsworne.tech/Bellsworne/steamforged-skies/pulls/6
2024-12-14 03:44:59 +00:00
cfd59e5332 Merge branch 'develop' into feature/moving-platforms 2024-12-13 22:38:43 -05:00
ca271afa6f Merge pull request 'Merging networking features' (#5) from feature/godot-steam-integration into develop
Reviewed-on: https://git.bellsworne.tech/Bellsworne/steamforged-skies/pulls/5
Reviewed-by: Gary Steven Keough <gskeough@bellsworne.com>
2024-12-14 03:37:16 +00:00
3f44872418 prepping to merge 2024-12-13 21:17:00 -06:00
641338fa14 Adjusted whitespace 2024-12-13 21:31:06 -05:00
230bf38a46 Remove old networking folder and edited whitespace 2024-12-13 21:13:20 -05:00
e4839dd7e8 Update list when user leaves lobby 2024-12-13 14:29:20 -06:00
0bef74cca6 fixed leave button 2024-12-13 11:57:19 -06:00
101c08c03f Many changes to loading avatars and populating user list 2024-12-13 11:52:59 -06:00
fc8bb540db Added stuff to the lobby scene 2024-12-13 10:50:00 -06:00
6650820429 New network manager test 2024-12-13 10:47:42 -06:00
707165373b Renaming and adding some stuff 2024-12-12 22:44:39 -06:00
1457820fc0 Archiving the network manager in prep for a new design 2024-12-12 22:40:38 -06:00
768bd00bd2 forgot to set my_avatar 2024-12-12 22:29:47 -06:00
4252317d82 Fixed the handshake not happening and changing the way avatars are cached 2024-12-12 22:28:06 -06:00
39ae47a520 Moved avatar loading to be cached when a new user joins 2024-12-12 22:07:34 -06:00
02617f2b5b Moved avatar loading to be solely the network managers job 2024-12-12 22:05:42 -06:00
0804f44c56 Actually this time 2024-12-12 21:56:12 -06:00
b1945e40c3 More test fixes 2024-12-12 21:46:24 -06:00
1c51964543 Testing fix for loading new user avatars 2024-12-12 21:21:52 -06:00
b576e32718 Lobby now populates users correctly 2024-12-12 21:10:33 -06:00
30fa3b4adb User list should now also populate on the client who joins 2024-12-12 20:59:16 -06:00
8f1455f9f6 network avatar load fix attempt 998 2024-12-11 23:09:46 -05:00
65ae7b78f2 Changed the way the lobby shows new players 2024-12-11 21:20:40 -06:00
d7bc9350bc Testing recursive 2024-12-11 21:05:14 -06:00
e891947dc7 Fixed lobby hopefully 2024-12-11 20:36:14 -06:00
3dfdccee27 Adjusted player username 2024-12-11 21:31:22 -05:00
4a8cb3813e Testing getting user data when joining 2024-12-11 20:26:26 -06:00
02757058f6 Fixed join lobby function 2024-12-11 19:41:21 -06:00
00717ea2fe Join lobby error checking 2024-12-11 19:26:37 -06:00
9b36da6cf4 steam p2p test 2024-12-10 22:36:59 -06:00
efd712cff8 Added more ship controls at helm 2024-12-10 22:36:55 -05:00
978bf30b6d Added interactable core system 2024-12-10 19:56:34 -05:00
fd55b0969e Add basic ship helm object 2024-12-10 19:18:41 -05:00
65630fe171 Add more ship visuals and adjust player script 2024-12-10 12:28:18 -05:00
9e344da33f Implemented basic ship mechanics 2024-12-09 23:38:29 -05:00
cd66b6d910 Merge branch 'chris-dev' into devlop 2024-12-10 03:33:03 +00:00
487697cc68 Merge pull request 'feature/godot-steam-integration' (#3) from feature/godot-steam-integration into chris-dev
Reviewed-on: https://git.bellsworne.tech/Bellsworne/steamforged-skies/pulls/3
Reviewed-by: Gary Steven Keough <gskeough@bellsworne.com>
2024-12-10 03:28:25 +00:00
ba70be0ffb Merge remote-tracking branch 'origin/feature/godot-steam-integration' into feature/godot-steam-integration 2024-12-09 21:17:20 -06:00
b95681e808 Added PlayerTag to the playercontroller that displays steam username 2024-12-09 21:17:10 -06:00
d3da6799f9 Merge pull request 'feature/godot-steam-integration' (#2) from feature/godot-steam-integration into devlop
Reviewed-on: https://git.bellsworne.tech/Bellsworne/steamforged-skies/pulls/2
Reviewed-by: Gary Steven Keough <gskeough@bellsworne.com>
2024-12-10 01:38:28 +00:00
b51230064e Merge branch 'devlop' into feature/godot-steam-integration 2024-12-10 01:38:06 +00:00
024aaacdac Merge remote-tracking branch 'origin/devlop' into feature/godot-steam-integration 2024-12-09 19:35:09 -06:00