Bellsworne/steamforged-skies
Bellsworne/steamforged-skies
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix corrupted scripts and scene files after merge. aka: IT WORKS

Browse Source
This commit is contained in:
Gary Steven Keough 2024-12-15 17:11:01 -05:00
parent 504ff449ca
commit ddbc4925b4
6 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
addons/godotsteam/win64/~libgodotsteam.windows.template_debug.x86_64.dll
View File

Binary file not shown.

11
assets/core/enviroment/dev-level/dev-level.tscn
View File

@ -6,13 +6,10 @@
[node name="DevLevel" type="Node3D"] [node name="DevLevel" type="Node3D"]
[node name="level" parent="." instance=ExtResource("3_vcq2f")] [node name="Sky" parent="." instance=ExtResource("4_uss2e")]
[node name="Player" parent="." instance=ExtResource("2_q510b")] [node name="level" parent="." instance=ExtResource("3_vcq2f")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.46532, 9.08969, 5.43659) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -10, 0)
joystick_camera_sens_multiplier = 5.0
[node name="ShuttleClass" parent="." instance=ExtResource("3_lsckv")] [node name="ShuttleClass" parent="." instance=ExtResource("3_lsckv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 8.4922, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.32076, 0)
[node name="Sky" parent="." instance=ExtResource("4_uss2e")]

1
assets/core/networking/scripts/NetworkManager.gd
View File

@ -104,7 +104,6 @@ func _on_lobby_created(connect: int, this_lobby_id: int) -> void:
lobby_id = this_lobby_id lobby_id = this_lobby_id
lobby_created.emit(lobby_id) lobby_created.emit(lobby_id)
print("Lobby created with ID: " + str(lobby_id)) print("Lobby created with ID: " + str(lobby_id))
host_id = steam_id
Steam.setLobbyJoinable(lobby_id, true) Steam.setLobbyJoinable(lobby_id, true)
Steam.setLobbyData(lobby_id, "name", str(steam_username) + "'s Lobby") Steam.setLobbyData(lobby_id, "name", str(steam_username) + "'s Lobby")

1
assets/core/networking/scripts/lobby.gd
View File

@ -49,7 +49,6 @@ func _on_lobby_joined(lobby_id: int):
func _on_user_joined_lobby(user_id: int): func _on_user_joined_lobby(user_id: int):
if user_id in added_users: if user_id in added_users:
return # User already added, skip return # User already added, skip
added_users.append(user_id) added_users.append(user_id)
update() update()

10
assets/core/player-controller/scripts/player.gd
View File

@ -9,12 +9,12 @@ var network_uuid: String = ""
var steam_id: int = 0 var steam_id: int = 0
@export_category("Player") @export_category("Player")
@export_range(1, 35, 1) var speed: float = 5 # m/s @export_range(1, 35, 1) var speed: float = 5.0
@export_range(10, 400, 1) var acceleration: float = 100 # m/s^2 @export_range(10, 400, 1) var acceleration: float = 100.0
@export_range(0.1, 3.0, 0.1) var jump_height: float = 1 # m @export_range(0.1, 3.0, 0.1) var jump_height: float = 1.0
@export_range(0.1, 3.0, 0.1, "or_greater") var camera_sens: float = 1 @export_range(0.1, 3.0, 0.1, "or_greater") var camera_sens: float = 1.0
@export_range(0.1, 3.0, 0.1, "or_greater") var joystick_camera_sens_multiplier: float = 2 @export_range(0.1, 3.0, 0.1, "or_greater") var joystick_camera_sens_multiplier: float = 5.0
@export var camera: Camera3D @export var camera: Camera3D
var jumping: bool = false var jumping: bool = false

BIN
godot-jolt/windows/~godot-jolt_windows-x64_editor.dll
View File

Binary file not shown.