Commit graph

13676 commits

Author SHA1 Message Date
karroffel
2e1f239fe6 [NativeScript] replace error macros by simple returns 2018-04-06 01:40:26 +02:00
Thomas Herzog
eaa5dfbdbd
Merge pull request #17980 from karroffel/nativescript-1.1-global-type-tags
[NativeScript] added global type tag system
2018-04-05 15:09:35 +02:00
Rémi Verschelde
43f298a783
Merge pull request #17984 from n4nn31355/fix_x11_segfault
Fix segfault on x11
2018-04-05 13:40:08 +02:00
Rémi Verschelde
e1b9c98032
Merge pull request #17806 from Zylann/fix_heightmap_shape_size_check
Make heightmap shape usable in PhysicsServer
2018-04-05 13:29:57 +02:00
Rémi Verschelde
866254343b
Merge pull request #17827 from bruvzg/macos_shortcut_key_remapping_fix
[macOS] Fix keyboard shortcuts on non QWERTY keyboard layouts.
2018-04-05 13:22:52 +02:00
n4nn31355
bdc64efcb3 Fix segfault on x11 2018-04-05 05:23:38 +03:00
karroffel
ad93d3e277 [NativeScript] added global type tag system 2018-04-05 00:06:33 +02:00
Rémi Verschelde
a1f835df77
Merge pull request #17775 from sketchyfun/multiply_blendmode_fix
multiply blend mode fix for spatial materials
2018-04-04 22:41:36 +02:00
Rémi Verschelde
7e9aa89fb8
Merge pull request #17777 from bruvzg/macos_exit_code
[macOS] Return exit code specified by `OS.exit_code` parameter.
2018-04-04 22:35:40 +02:00
Rémi Verschelde
e223702776
Merge pull request #17784 from Rubonnek/rename-shortcut
Added shortcut to rename files
2018-04-04 22:27:21 +02:00
Rémi Verschelde
919209907d
Merge pull request #17792 from eska014/enginejs-preloadpaths
Handle directories in engine.js preloadFile()
2018-04-04 22:26:14 +02:00
Rémi Verschelde
bba80721dc
Merge pull request #17801 from endragor/android-input-checks
Add safety checks when handling Android input
2018-04-04 22:09:03 +02:00
Rémi Verschelde
b35524db78
Merge pull request #17819 from Chaosus/absfix
Remove redundant unsigned abs shader builtin
2018-04-04 21:55:03 +02:00
Rémi Verschelde
90574a394a
Merge pull request #17978 from Paulb23/rename_gd_highlighter
Renamed GDSyntaxHighlighter to GDScriptSyntaxHighlighter
2018-04-04 21:31:13 +02:00
Paulb23
63c8d0f455 Renamed GDSyntaxHighlighter to GDScriptSyntaxHighlighter 2018-04-04 20:02:42 +01:00
Thomas Herzog
7ca2e73dea
Merge pull request #17965 from karroffel/gdnativelib-config-api
[GDNative] some GDNativeLibrary improvements
2018-04-04 16:09:37 +02:00
Rémi Verschelde
c5bb997a8f
Merge pull request #17969 from Alexander-Alekseev/upd_xform_btns_using_shortcuts
Update transform buttons in tile editor while using T, A, S shortcuts
2018-04-04 15:31:10 +02:00
Alexander Alekseev
0853ac2006 Update transform buttons in tile editor while using T, A, S shortcuts (fixes #17962) 2018-04-04 16:02:44 +03:00
Max Hilbrunner
cbe886b619
Merge pull request #17945 from romlok/cameradoctweaks
[DOCS] Tweaks and fixes for (Interpolated)Camera
2018-04-04 14:04:48 +02:00
karroffel
f29139f3cf [GDNative] enable saving GDNativeLibrary as sub resource 2018-04-04 13:07:43 +02:00
Rémi Verschelde
d991e99321
Merge pull request #17816 from NikodemL/fix_file_show_in_explorer
FIX: FILE_SHOW_IN_EXPLORER now correctly shows the file's directory
2018-04-04 12:31:05 +02:00
karroffel
57c0339d9f [GDNative] easier GDNativeLib handling 2018-04-04 12:24:10 +02:00
Rémi Verschelde
1d4b0751fe
Merge pull request #17884 from AndreaCatania/crash
Corrected physics query max result checking
2018-04-04 12:19:38 +02:00
Andrea Catania
444b8471a3 Corrected physics query max result checking 2018-04-04 11:55:58 +02:00
Rémi Verschelde
e1fef9bd76
Merge pull request #17959 from AndreaCatania/kinfix2
Fixed kinematic sliding on trimesh
2018-04-04 11:21:49 +02:00
Andrea Catania
b050525072 Fixed kinematic sliding on trimesh 2018-04-04 10:49:10 +02:00
Rémi Verschelde
950d4922a5
Merge pull request #17863 from covariantlabs/add-move-selected-tiles
Add functionality to move selected tiles in tile map editor
2018-04-04 09:54:08 +02:00
Rémi Verschelde
5ede505f14
Merge pull request #17923 from Paulb23/add_abstract_syntax_highlighter
Abstracted the syntax highlighter from text edit.
2018-04-04 09:50:51 +02:00
Martin Rieke
d538fcd92d Add functionality to move selected tiles in tile map editor
This change adds a new entry "Move Selection" to the "Tile Map"
menu in the tile map editor. It allows the user to easily move
as set of selected tiles.
2018-04-04 09:23:56 +02:00
Rémi Verschelde
bcf5b748b5
Merge pull request #17832 from YeldhamDev/popups_size_fix
Fixed some popups not shrinking their size back when losing items
2018-04-03 23:53:47 +02:00
Rémi Verschelde
1710582473
Merge pull request #17847 from Faless/lws_update
LWS v2.4.2, mbedTLS v2.8.0, Websocket  SSL support
2018-04-03 23:14:01 +02:00
Rémi Verschelde
60d89d0ab3
Merge pull request #17854 from BastiaanOlij/fix_vehicle_body
Improve side impulse calculation
2018-04-03 23:12:17 +02:00
Rémi Verschelde
82c26f74ad
Merge pull request #17865 from delftswa2018/enumLookupFix
Ctrl+Clicking a enum now scrolls down to it in the docs.
2018-04-03 22:43:07 +02:00
Rémi Verschelde
a7dd698d4d
Merge pull request #17900 from AndreaCatania/area_mon
physics area added monitorable check
2018-04-03 22:09:56 +02:00
Rémi Verschelde
7b1c661269
Merge pull request #17914 from Rubonnek/add-signal-to-videoplayer
Added signal to VideoPlayer to notify when the video finished playing
2018-04-03 22:06:47 +02:00
Felix Yang
7d5a40c3e6 Ctrl+Clicking a enum now scrolls down to it in the docs. 2018-04-03 21:56:54 +02:00
Rémi Verschelde
6a9622aaa2
Merge pull request #17947 from karroffel/animation-scale-rotation-order-fix
fix bone scale/rotation in AnimationPlayers
2018-04-03 21:36:49 +02:00
Rémi Verschelde
95b499644e
Merge pull request #17834 from Rubonnek/move-to-initializer-list
Move GodotSharp and MonoBuildTab member variables to initializer list
2018-04-03 21:01:58 +02:00
Fabio Alessandrelli
2e078142a0 Websocket client SSL support 2018-04-03 20:13:57 +02:00
Fabio Alessandrelli
490dd9f946 Generalize SSL cert reading from file 2018-04-03 20:13:57 +02:00
Fabio Alessandrelli
d97c45ad2e MbedTLS PR 1453 (fix UWP build)
The patch seems to be ready for merge upstream
2018-04-03 20:13:55 +02:00
Fabio Alessandrelli
7e776f5b2e Small patch to change mbedtls _WIN32_WINNT 2018-04-03 20:13:12 +02:00
Fabio Alessandrelli
febec68763 Update mbedTLS to version 2.8.0 2018-04-03 19:25:24 +02:00
Fabio Alessandrelli
629783f3aa Always verify peer certificate in lws.
Behavior is defined by SSL flags passed via the context.

Simplified port of the patch submitted and accepted in lws master branch
(PR 1215)
2018-04-03 19:25:24 +02:00
Fabio Alessandrelli
13185681ff mbedtls: client: stop spinning on handshake fail
Backport cf3a4ee49357f4e6f3aaeb98137d85c307b17008 from 2.4-stable to
2.4.2
2018-04-03 19:25:24 +02:00
Fabio Alessandrelli
dbf7898cea Fix lws MinGW compilation
Cherry picked 5b22276420032677841af9e9f3b0272d0dd467b8 from upstream.
This is fixed upstream and will be included in the next release
2018-04-03 19:25:24 +02:00
Fabio Alessandrelli
262cb262eb Bump libwebsockets to version 2.4.2 2018-04-03 19:25:24 +02:00
karroffel
4303fbca5a fix bone scale/rotation in AnimationPlayers
fixes #17325.

The bone pose transform was created by setting the rotation and
**then** scaling the transform. This leads to object "deformation"
that's not intended.
2018-04-03 16:43:50 +02:00
Mel Collins
99110772c0 [DOCS] Tweaks and fixes for (Interpolated)Camera 2018-04-03 15:58:21 +02:00
Rémi Verschelde
9ad1800298
Merge pull request #17869 from TomDobbelaere/rename-error-usability
Trigger rename_error's close_fail_notify only after exhausting attempts on Windows
2018-04-03 13:21:53 +02:00