Merge branch 'main' into signs-light

.github/workflows/godot.yml

@@ -109,4 +109,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
         run: |
-          gh release upload '${{ github.ref_name }}' * --repo '${{ github.repository }}'
+          gh release upload '${{ github.ref_name }}' */* --repo '${{ github.repository }}'

project.godot

@@ -178,6 +178,11 @@ dash={
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":5,"axis_value":1.0,"script":null)
 ]
 }
+toggle_fullscreen={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194342,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
 
 [layer_names]
 

scenes/Main.gd

@@ -141,6 +141,10 @@ func _on_settings_back():
     _start_game()
 
 func _input(event):
+
+  if Input.is_action_pressed("toggle_fullscreen"):
+    GlobalMenuEvents.emit_on_fullscreen_toggled(not GraphicsManager.fullscreen)
+
   if not game_started:
     return
 

scenes/menu/GraphicsSettings.gd

@@ -8,6 +8,7 @@ var _loaded_settings = false
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
+  GlobalMenuEvents._on_fullscreen_toggled.connect(_on_fullscreen_toggled)
   _load_settings()
   if _xr:
     _vbox.get_node("FPSOptions").visible = false
@@ -81,6 +82,7 @@ func _on_enable_fog_toggled(toggled_on: bool):
 
 func _on_fullscreen_toggled(toggled_on: bool):
   GraphicsManager.set_fullscreen(toggled_on)
+  _vbox.get_node("DisplayOptions/Fullscreen").set_pressed_no_signal(toggled_on)
 
 func _on_render_scale_value_changed(value: float):
   GraphicsManager.set_render_scale(value)

scenes/util/GlobalMenuEvents.gd

@@ -4,6 +4,7 @@ signal ui_cancel_pressed
 signal ui_accept_pressed
 signal hide_menu
 signal return_to_lobby
+signal _on_fullscreen_toggled(enabled: bool)
 signal set_current_room
 signal set_xr_movement_style
 signal set_movement_speed
@@ -33,6 +34,9 @@ func emit_return_to_lobby():
 func emit_set_current_room(room):
   emit_signal("set_current_room", room)
 
+func emit_on_fullscreen_toggled(enabled):
+  emit_signal("_on_fullscreen_toggled", enabled)
+
 func emit_set_xr_movement_style(style):
   emit_signal("set_xr_movement_style", style)