Merge pull request #422 from V-Sekai/merge

Update builds.yml for macos arm64
V-Sekai · May 8, 2024 · a0e2dd6 · a0e2dd6
2 parents 58896e4 + afba4d3
commit a0e2dd6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   GAME_NAME: vsekai_game_
-  GODOT_REF: groups-4.3.2024-04-29T120152Z
+  GODOT_REF: groups-4.3.2024-05-06T034208Z
   GODOT_REPOSITORY: v-sekai/godot
   SCONSFLAGS: verbose=yes warnings=extra werror=no module_text_server_fb_enabled=yes use_thinlto=yes
   DOTNET_NOLOGO: true

diff --git a/addons/sar1_vr_manager/localisation/vr_manager_strings.en.translation b/addons/sar1_vr_manager/localisation/vr_manager_strings.en.translation
diff --git a/addons/vsk_menu/localisation/menu_strings.en.translation b/addons/vsk_menu/localisation/menu_strings.en.translation
diff --git a/addons/vsk_menu/localisation/menu_strings.es.translation b/addons/vsk_menu/localisation/menu_strings.es.translation
diff --git a/project.godot b/project.godot
@@ -116,9 +116,11 @@ settings/enabled=true
 
 [display]
 
-window/size/viewport_width=1920
-window/size/viewport_height=1080
+window/size/viewport_width=1280
+window/size/viewport_height=800
 window/size/resizable=false
+window/size/extend_to_title=true
+window/energy_saving/keep_screen_on=false
 window/stretch/mode="canvas_items"
 window/stretch/aspect="keep_height"
 window/vsync/vsync_mode=2