Commit graph

16407 commits

Author SHA1 Message Date
Rémi Verschelde
bec00110e0
Merge pull request #21510 from milkowski/master
No need to link with libandroid_support.a in NDK 17
2018-08-28 07:47:59 +02:00
Rémi Verschelde
ac38b7e97b
Merge pull request #21496 from tko/macos-complete
[macOS] change "Complete Symbol" shortcut to not conflict with Spotlight
2018-08-28 07:40:55 +02:00
Rémi Verschelde
cda5a56808
Merge pull request #21495 from tko/macos-replace
[macOS] fix conflicting keybindings for (Find and) Replace...
2018-08-28 07:38:30 +02:00
elasota
084cbdefa2 Fix BPTC and fix importing HDR images with LDR compression 2018-08-27 23:05:04 -04:00
Chris Bradfield
285234e8d9 [DOCS] Corrections and clarifications 2018-08-27 18:56:43 -07:00
Wojciech Milkowski
3a3ea6d514 No need to link with libandroid_support in NDK 17
According to https://github.com/bytedeco/javacpp/pull/244 in NDK 17
libandroid_support library is not needed any more, and on armv8 is
already gone which breaks compilation.
2018-08-28 02:34:59 +02:00
Leon Krause
b4b816c122 Enable Theora module for HTML5 platform 2018-08-28 01:56:47 +02:00
Juan Linietsky
02490dbd2c
Merge pull request #21507 from fire/gltf2_quat_normalization
GLTF2 animation regression with Quat normalization
2018-08-27 19:27:06 -03:00
K. S. Ernest (iFire) Lee
fa62037ff6 In the GLTF importer normalize Quaternions after every operation and when reading from the format. 2018-08-27 14:59:28 -07:00
Ignacio Etcheverry
6b10e3750e
Merge pull request #21497 from neikeq/hm
C# generated classes ignore warning CS1591 and cleanup
2018-08-27 21:43:46 +02:00
Ignacio Etcheverry
aa2bcf3dfc C# generated classes ignore warning CS1591 and cleanup 2018-08-27 20:39:51 +02:00
Tommi Komulainen
c2f0b4c9c6 [macOS] change "Complete Symbol" shortcut to not conflict with Spotlight
The default shortcut for Spotlight search is Command+Space so try not to
use it. Instead use Ctrl+Space similar to Xcode.
2018-08-27 20:39:43 +02:00
Tommi Komulainen
464756ec0f [macOS] fix conflicting keybindings for (Find and) Replace...
```
Play Scene        Command+R           (no change)
Replace...        Command+R        => Option+Command+F
Find Function...  Option+Command+F =>   Ctrl+Command+J
```

On macOS Option+Command+F is commonly used for Find and Replace so use
it instead to avoid conflicting with "Play Scene"

And as Option+Command+F is currently used by "Find Function..." rebind
the latter to Control+Command+J which is the Xcode shortcut for
"Jump to Definition"

Fixes #19817
2018-08-27 20:28:24 +02:00
Juan Linietsky
0565adb20f Removed fallback system and merged bptc into s3tc 2018-08-27 13:47:35 -03:00
Rémi Verschelde
79c6a83c99 Bump version to 3.1-alpha
IMPORTANT: This means that the master branch is now considered feature-complete
for the upcoming 3.1 release, and thus in *feature freeze*.

Unless explicitly allowed by project maintainers, no new feature PRs will be
considered for merge until Godot 3.1-stable is released. Current PRs made
before the feature freeze will still be reviewed and potentially merged before
the beta stage, if deemed satisfactory.
2018-08-27 18:17:35 +02:00
Juan Linietsky
2428ec6205
Merge pull request #21453 from BlackCatter/triplanar-detail-fix
Fix error using triplanar UV with detail map
2018-08-27 13:04:47 -03:00
Juan Linietsky
02d2676dc9
Merge pull request #21405 from SneakyMax/fix-animation-condition-advancing
Fix advancing based on condition in AnimationNodeStateMachinePlayback
2018-08-27 13:04:02 -03:00
Rémi Verschelde
1fe6ad6a9d
Merge pull request #21400 from rfht/master
log to console if falling back to dummy audio driver
2018-08-27 18:03:52 +02:00
Rémi Verschelde
9df5ddae29
Merge pull request #21456 from MarianoGnu/tileset_editor
TileSet editor Fixes
2018-08-27 17:49:02 +02:00
Rémi Verschelde
66778eae71
Merge pull request #21420 from elasota/fix-last-mipmap
Fix uninitialized mipmap levels
2018-08-27 17:48:41 +02:00
Rémi Verschelde
f06b7d40c8
Merge pull request #21449 from vnen/gdscript-builtin-is
Allow `is` operator to test built-in types
2018-08-27 17:48:11 +02:00
Rémi Verschelde
5b87864385
Merge pull request #21369 from Noshyaar/exportflag
Deprecating bit flags export with no hint text
2018-08-27 17:47:21 +02:00
Rémi Verschelde
573d03d888
Merge pull request #21489 from godotengine/revert-21236-windows-graceful-close
Revert "Try closing gracefully before terminating process"
2018-08-27 17:33:27 +02:00
Rémi Verschelde
72996df656
Revert "Try closing gracefully before terminating process" 2018-08-27 17:32:43 +02:00
Rémi Verschelde
c1f687c681
Merge pull request #21387 from hpvb/fix-15324
Fall back to GLES2 if GLES3 is not working
2018-08-27 16:54:22 +02:00
Ignacio Etcheverry
78bb53f85d
Merge pull request #21205 from KellyThomas/c-sharp-feature-parity-quat
[Mono] Quat - add some missing constructors and methods
2018-08-27 16:18:09 +02:00
Rémi Verschelde
35fbb11cec
Merge pull request #21484 from Omicron666/patch-1
Typo in text string
2018-08-27 16:16:57 +02:00
Omicron
71397e0e17
Typo in text string
reported by Yuri Chornoivan on weblate
2018-08-27 16:12:48 +02:00
JFonS
b58bb95c86 Saner selection code for instanced scenes in 3D, should close #21447
Selecting instanced scenes still doesn't work properly because gizmos are not being added to instanced nodes.
I will probably work on fixing all the shenanigans around selection, but that will take some time.
This part of the code should work better for the moment.
2018-08-27 16:02:49 +02:00
Juan Linietsky
eb25cd0737
Merge pull request #21483 from godotengine/revert-21467-fix-3d-textures
Revert "Fix some 3D texture issues"
2018-08-27 10:12:39 -03:00
Juan Linietsky
bca706b361
Revert "Fix some 3D texture issues" 2018-08-27 10:12:07 -03:00
Rémi Verschelde
87725e891d
Merge pull request #21481 from BastiaanOlij/bind_mesh_methods
Bound get surface functions on mesh
2018-08-27 15:06:45 +02:00
thfrwn
d37e9ef95d log to console if falling back to dummy audio driver 2018-08-27 05:35:59 -07:00
Bastiaan Olij
ca677090ff Bound get surface functions on mesh 2018-08-27 21:49:27 +10:00
Rémi Verschelde
2928091ce2
Merge pull request #21477 from akien-mga/tile_set_shape_offset
TileSet: Bind tile_set_shape_offset and getter
2018-08-27 13:39:40 +02:00
Rémi Verschelde
439e562b1a
Merge pull request #21474 from elasota/fix-cvtt-scalar
Fix CVTT scalar version not compiling
2018-08-27 13:36:23 +02:00
Rémi Verschelde
fa2c5bea3c TileSet: Bind tile_set_shape_offset and getter
Fixes #21476.
2018-08-27 11:09:11 +02:00
Rémi Verschelde
49cf675ef4
Merge pull request #21450 from vnen/gdscript-type-space
Remove space before colon on type hints
2018-08-27 10:42:19 +02:00
elasota
0fe3bda9af Fix CVTT scalar version not compiling 2018-08-27 04:15:52 -04:00
Rémi Verschelde
3dc63a710f
Merge pull request #21469 from akien-mga/glsl-clang-format
Style: Enable clang-format on GLSL shaders
2018-08-27 10:12:24 +02:00
Rémi Verschelde
ddfef86836 Fix build after c2a9cb34
`return` statements were missing, and those warnings do not need to be
behind #ifdefs, they do not expose any deprecated API.
2018-08-27 10:10:40 +02:00
Rémi Verschelde
3c0ea513de
Merge pull request #21460 from hpvb/fix-19716
When setting an X11 icon fails, try halving the size
2018-08-27 10:03:47 +02:00
Rémi Verschelde
0ba84b3f23
Merge pull request #21467 from elasota/fix-3d-textures
Fix some 3D texture issues
2018-08-27 09:51:05 +02:00
Rémi Verschelde
2131f101b6
Merge pull request #21470 from elasota/fix-tiled-exr
Fix tiled EXR import
2018-08-27 09:46:57 +02:00
Rémi Verschelde
fc1d464f1f
Merge pull request #21381 from YeldhamDev/members_help_overview_fix
Fix Members/Help Overview getting their items deselected when a tooltip appears
2018-08-27 09:43:00 +02:00
Rémi Verschelde
0f4ba4481a
Merge pull request #21432 from JFonS/fix_material_convert
Fix "Convert To ShaderMaterial" option not working, closes #20891
2018-08-27 08:55:41 +02:00
elasota
4b7885fb1e Fix tiled EXR crash, update tinyexr to head to fix corrupted uncompressed EXR loading 2018-08-27 02:52:12 -04:00
Rémi Verschelde
a543c68959
Merge pull request #21466 from elasota/fix-layered-texture-import
Fix crash when importing layered textures
2018-08-27 08:00:15 +02:00
Rémi Verschelde
98cc2ce1dd
Merge pull request #21433 from AndreaCatania/megafix
Multiple fixes on Physics things
2018-08-27 07:46:40 +02:00
Rémi Verschelde
4226d56ca9 Style: Enable clang-format on GLSL shaders
As of clang-format 6.0.1, putting the `/* clang-format off */` hint
around our "invalid" `[vertex]` and `[shader]` statements isn't enough
to prevent a bogus indent of the next comments and first valid statement,
so we need to enclose that first valid statement in the unformatted chunk.
2018-08-27 07:34:14 +02:00