Skip to content

Commit

Permalink
Merge pull request #53 from lufog/sync_with_master
Browse files Browse the repository at this point in the history 
Sync with Godot master
  • Loading branch information
@nikitalita
nikitalita authored May 26, 2022
2 parents 03d2114 + 8249cb2 commit 2e2669a
Show file tree
Hide file tree
Showing 90 changed files with 533 additions and 568 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/all_builds.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
# SCONS_CACHE for windows must be set in the build environment
env:
GODOT_BASE_BRANCH: master
GODOT_MAIN_SYNC_REF: 489f11ee0cbbb90f4f629aa7fd846078148aaa8e
GODOT_MAIN_SYNC_REF: ff75a49227d8d81f99b728fc89b1e4e6e79ed5be
SCONSFLAGS: verbose=yes warnings=all werror=no module_text_server_fb_enabled=yes debug_symbols=no
SCONSFLAGS_TEMPLATE: no_editor_splash=yes module_bmp_enabled=no module_bullet_enabled=no module_camera_enabled=no module_cvtt_enabled=no module_mbedtls_enabled=no module_tga_enabled=no module_enet_enabled=no module_mobile_vr_enabled=no module_upnp_enabled=no module_gdnative_enabled=no module_opensimplex_enabled=no module_pvr_enabled=no module_webm_enabled=no module_websocket_enabled=no module_xatlas_unwrap_enabled=no module_squish_enabled=no use_static_cpp=yes builtin_freetype=yes builtin_libpng=yes builtin_zlib=yes builtin_libwebp=yes builtin_libogg=yes module_csg_enabled=yes module_gridmap_enabled=yes disable_3d=no
SCONS_CACHE_MSVC_CONFIG: true
Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_015d36d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_015d36d.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_054a2ac.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_054a2ac.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_0b806ee.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_0b806ee.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_1a36141.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_1a36141.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_1add52b.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_1add52b.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_1ca61a3.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_1ca61a3.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_216a8aa.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_216a8aa.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_2185c01.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_2185c01.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_23381a5.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_23381a5.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_23441ec.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_23441ec.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_30c1229.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_30c1229.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_31ce3c5.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_31ce3c5.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_3ea6d9f.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_3ea6d9f.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_48f1d02.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_48f1d02.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_4ee82a2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_4ee82a2.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_506df14.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_506df14.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_513c026.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_513c026.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_514a3fb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_514a3fb.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_5565f55.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_5565f55.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_5e938f0.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_5e938f0.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_6174585.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_6174585.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_620ec47.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_620ec47.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_62273e5.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_62273e5.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_64872ca.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_64872ca.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_65d48d6.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_65d48d6.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_6694c11.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_6694c11.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_703004f.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_703004f.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_7124599.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_7124599.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_7d2d144.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_7d2d144.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_7f7d97f.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_7f7d97f.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_85585c7.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_85585c7.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_8aab9a0.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_8aab9a0.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_8b912d1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_8b912d1.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_8c1731b.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_8c1731b.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_8cab401.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_8cab401.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_8e35d93.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_8e35d93.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_91ca725.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_91ca725.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_97f34a1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_97f34a1.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_a3f1ee5.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_a3f1ee5.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_a56d6ff.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_a56d6ff.h"

Expand Down
2 changes: 1 addition & 1 deletion bytecode/bytecode_a60f242.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "core/io/marshalls.h"
#include "core/string/print_string.h"
#include "core/templates/map.h"
#include "core/templates/rb_map.h"

#include "bytecode_a60f242.h"

Expand Down
Loading

0 comments on commit 2e2669a

Please sign in to comment.