Commit Graph

29504 Commits

Author SHA1 Message Date
Rémi Verschelde
513b39882a
Merge pull request #40436 from DanielZTing/master
Evenly distribute stretched Nodes in BoxContainer
2020-07-24 13:47:18 +02:00
Rémi Verschelde
93b50a62e3
Merge pull request #40652 from akien-mga/ci-more-cache-key
CI: Fix cache key and include base branch
2020-07-24 09:32:48 +02:00
Rémi Verschelde
2cf5ad9ea9 CI: Fix cache key and include base branch
The base branch is hardcoded as an env variable as I couldn't find a simple
way to just get either `3.2` or `master`. But it's easy to change when we
branch off from `master` to a new stable branch, which doesn't happen often.

(There's `{{github.base_ref}}` but it's probably more verbose like
`ref/heads/master`, and only valid for PRs.)
2020-07-24 08:28:43 +02:00
Rémi Verschelde
422a2da8c7
Merge pull request #40648 from RevoluPowered/github_actions_cache_fixes
GitHub actions cache fixes
2020-07-24 07:30:26 +02:00
Gordon MacPherson
afdce1e30c Improve the cache keys to prevent clashes for the wrong type of build 2020-07-24 00:15:23 +01:00
Gordon MacPherson
3c07d0ff32 Clamp scons cache to 4096 MB 2020-07-24 00:14:03 +01:00
Rémi Verschelde
3811fb919e
Merge pull request #40598 from vnen/gdscript-2.0
GDScript 2.0 (again)
2020-07-24 01:04:57 +02:00
Rémi Verschelde
819ef12d68
Merge pull request #40646 from akien-mga/ci-gh-action-linux-mono
CI: Add Mono support to Linux builds on GitHub Actions
2020-07-24 00:55:09 +02:00
Rémi Verschelde
b5ad6fa22c CI: Drop Travis CI config, replaced by GitHub Actions 2020-07-24 00:29:11 +02:00
Rémi Verschelde
0e294e6d25 CI: Add Mono support to Linux builds on GitHub Actions
Mono seems to be preinstalled in the build environment \o/
2020-07-24 00:29:11 +02:00
Rémi Verschelde
8beb5f277d
Merge pull request #40644 from akien-mga/ci-gh-action-javascript
CI: Add GitHub Action build for JavaScript
2020-07-24 00:28:38 +02:00
Rémi Verschelde
cc530fdbe4 CI: Add GitHub Action build for JavaScript
Uses mymindstorm/setup-emsdk to install Emscripten and set up
caching for Emscripten's generated system libraries.
2020-07-24 00:06:34 +02:00
Rémi Verschelde
b642e430ce
Merge pull request #40643 from KoBeWi/key_keeper
Keep transition value when replacing key
2020-07-24 00:03:43 +02:00
Rémi Verschelde
c853dd5ddb
Merge pull request #40632 from asmaloney/macos-maya-scroll
[macOS] Fix Maya navigation with ALT + mouse scroll
2020-07-23 23:39:31 +02:00
Tomasz Chabora
e1a1bb0a6e Keep transition value when replacing key 2020-07-23 22:59:04 +02:00
Rémi Verschelde
3c6f5226f7
Merge pull request #40635 from KoBeWi/🏃
Fix run project when current scene was never saved
2020-07-23 22:31:01 +02:00
Rémi Verschelde
cc1529abae
Merge pull request #40437 from thebestnom/Android-Template-github-action
Github Action for Android Template
2020-07-23 21:58:08 +02:00
Rémi Verschelde
f5091681b4
Merge pull request #40639 from KoBeWi/fix_emoji🎉🎉
Fix emoji branch compilation error
2020-07-23 21:55:07 +02:00
Tomasz Chabora
2407562366 Fix emoji branch compilation error 2020-07-23 19:42:37 +02:00
Tomasz Chabora
9c84e34fd4 Fix run project when current scene was never saved 2020-07-23 18:51:32 +02:00
thebestnom
383ad22ee7 CI: Added Android GitHub Action 2020-07-23 19:36:53 +03:00
Rémi Verschelde
f4c17da6f5
Merge pull request #40556 from aaronfranke/gha-sep-workflows
Split CI builds into workflows for each OS
2020-07-23 18:05:13 +02:00
Rémi Verschelde
1dc00ce7b9
Merge pull request #40348 from amanj120/forward_port_bundle_pr_icons
Copy project icons to Gradle project directory during Android Custom Build.
2020-07-23 18:03:08 +02:00
Rémi Verschelde
a30bac94cc
Merge pull request #39737 from Cevantime/add_force_caret_displayed_to_line_edit
add force caret display to line edit
2020-07-23 18:02:51 +02:00
Aman Jain
4a5ddcbad2 Copy icons to Gradle project 2020-07-23 11:37:33 -04:00
Andy Maloney
394a7826be [macOS] Fix Maya navigation with ALT + mouse scroll
Methods were being called with InputEventMouseMotion instead of InputEventPanGesture, and they were null.

Fixes godotengine/godot#16181 on the master branch
2020-07-23 10:38:31 -04:00
Rémi Verschelde
dfdc48a9de
Merge pull request #40628 from reduz/fix-dynamic-light-crash
Fixes RenderingServer crashes reported by #39951
2020-07-23 13:13:37 +02:00
Juan Linietsky
acf32e87d5 Fixes RenderingServer crashes reported by #39951
Supersedes #40026
2020-07-23 07:58:23 -03:00
Rémi Verschelde
bd00ab7516
Merge pull request #40625 from akien-mga/gitignore-binutils-stXXXXXX
gitignore: Ignore binutils linker temp stXXXXXX objects
2020-07-23 10:42:40 +02:00
Rémi Verschelde
460a00619e
Merge pull request #40605 from QbieShay/spring-arm-doc-fix
fixed documentation for get_hit_length of spring arm 3D
2020-07-23 10:34:16 +02:00
Rémi Verschelde
5e8b188365 gitignore: Ignore binutils linker temp stXXXXXX objects
Fixes #40607.

Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro>
2020-07-23 10:25:43 +02:00
Rémi Verschelde
2267caa4a1
Merge pull request #40606 from adam-bates/issue-40396_add_missing_json_errors
issue-40396 - Added missing error strings to JSON parsing when array …
2020-07-23 10:01:33 +02:00
Rémi Verschelde
f0b58928ea
Merge pull request #40623 from akien-mga/scons-remove-debug-memory-enabled
SCons: Remove unused DEBUG_MEMORY_ENABLED define
2020-07-23 09:58:19 +02:00
Rémi Verschelde
5671469724
Merge pull request #37336 from dreamsComeTrue/canvas-editor-change-cursor
Request immediate refresh of cursor in 2D editor while using shortcuts
2020-07-23 09:49:48 +02:00
Rémi Verschelde
6ad0aecb3b
Merge pull request #39871 from aaronfranke/pr-template
Add a PR template with a message about PRs needing to be for master
2020-07-23 09:47:11 +02:00
Rémi Verschelde
b51688f6b0
Merge pull request #40602 from follower/patch-12
Fix presumed copy/paste error: "Returns" -> "Sets"
2020-07-23 09:42:25 +02:00
Rémi Verschelde
df2eb860a6
Merge pull request #40611 from mega-bit/GodotSharpDocTypos
Fix typos in GodotSharp code docs
2020-07-23 09:41:52 +02:00
Rémi Verschelde
dcf902df85 SCons: Remove unused DEBUG_MEMORY_ENABLED define
Its last use was removed in Godot 3.0, so it no longer makes sense to define.

Also removed `D3D_DEBUG_INFO` for Windows as it's likely a left over from a
long time ago pre-opensourcing when Godot had some form of Direct3D 9 support?
2020-07-23 09:39:10 +02:00
Rémi Verschelde
e38ad5d3de
Merge pull request #40616 from reduz/refactor-light-clustering
Refactor light clustering
2020-07-23 08:25:59 +02:00
Juan Linietsky
ee7c98da7c Refactor light clustering
Move from high end to shared, so all renderers use clustering.
2020-07-22 20:39:51 -03:00
QbieShay
d1bff73611 fixed documentation for get_hit_length of spring arm 3D
Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro>
2020-07-22 23:08:37 +02:00
mega-bit
0ca96ae2c1 Fix typos in GodotSharp code docs 2020-07-22 22:46:04 +02:00
Adam Bates
8f84dfa91d issue-40396 - Added missing error strings to JSON parsing when array or object is never closed. 2020-07-22 15:06:57 -04:00
Aaron Franke
78693cdc55
Add a PR template with a message about PRs needing to be for master
[ci skip]

Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
2020-07-22 13:04:58 -04:00
follower
e38b63400c
Fix presumed copy/paste error: "Returns" -> "Sets"
I might be going out on a limb here... :D
2020-07-23 04:21:29 +12:00
Rémi Verschelde
0cd98ec7e1
Merge pull request #40600 from akien-mga/vs-duplicate-branches-warning
VisualScript: Fix -Wduplicate-branches warning
2020-07-22 17:29:22 +02:00
Rémi Verschelde
938e2e966f
Merge pull request #40599 from akien-mga/vulkan-init-structs
Vulkan: Fix struct init for VkClearAttachment
2020-07-22 17:00:40 +02:00
Rémi Verschelde
9a586defed VisualScript: Fix -Wduplicate-branches warning
When VSDEBUG is a no-op (default), those branches did the same (nothing).
2020-07-22 16:57:28 +02:00
Rémi Verschelde
dfdfee04df Vulkan: Fix struct init for VkClearAttachment
The changes from #38835 were not sufficient to fix #38829, as VkClearAttachment
still had uninitialized member structs in its VkClearColor member struct.

The struct rabbit hole goes deep and trying to do validation as done in #38829
doesn't appear realistic.
2020-07-22 16:31:22 +02:00
Rémi Verschelde
f54fd5ac10
Merge pull request #38835 from madmiraal/fix-38829
Fix may be used unitialized warnings in _render_pass_create() and  _draw_list_insert_clear_region().
2020-07-22 16:12:54 +02:00