Commit Graph

10199 Commits

Author SHA1 Message Date
Rémi Verschelde
84251d7aec Merge pull request #12195 from groud/fix_snapping
Fix snapping with 2D nodes

[ci skip]
2017-10-20 12:42:35 +02:00
Rémi Verschelde
3517e791ce Merge pull request #12190 from marcelofg55/bsd_fixes
Fix BSD compile issues

[ci skip]
2017-10-20 12:42:02 +02:00
Gilles Roudiere
5e348e72c1 Merge pull request #12159 from RandomShaper/fix-sticky-slider
Reset slider mouse state on hiding/removing
2017-10-20 11:48:57 +02:00
Rémi Verschelde
3971bd41bb Merge pull request #12246 from ISylvox/editable-warning
Adjust Editable_Warning for "This resource was imported...." Alert

[ci skip]
2017-10-20 10:33:10 +02:00
Gilles Roudiere
62ed861774 Merge pull request #12234 from marcelofg55/color8_fix
Fix Color.r8/g8/b8/a8 being type float instead of type int
2017-10-20 10:26:44 +02:00
Indah Sylvia
cf8537ad37 Adjusted editable_warning for "This resource was imported...." alert:
- fixed a typo from it's to its
- added 'then' to make it clearer
2017-10-20 09:47:29 +07:00
Marcelo Fernandez
d3a039cb2f Fix Color.r8/g8/b8/a8 being type float instead of type int 2017-10-19 12:36:06 -03:00
Rémi Verschelde
6a363ad470 Merge pull request #12230 from BastiaanOlij/arvr_fix_binand
Fix button signals on ARVRController

[ci skip]
2017-10-19 16:19:24 +02:00
Rémi Verschelde
f85d428b56 Merge pull request #12053 from Grosskopf/audiodocs-fix
filtering getters&setters over strings works for AudioStreamPlayer*
2017-10-19 16:17:41 +02:00
Rémi Verschelde
f2a31aeefb Merge pull request #12229 from Noshyaar/pr-v
Fix Viewport clear mode is bool instead of int, fixes #12202

[ci skip]
2017-10-19 16:11:11 +02:00
Bastiaan Olij
914c4d3066 Always mixing up binary and and boolean and... 2017-10-20 00:28:17 +11:00
Gilles Roudiere
1c1ddc9381 Merge pull request #12211 from AlexHolly/fix-itemlist-rmb-pos
Itemlist rmb now provides the same pos as Tree rmb
2017-10-19 13:35:10 +02:00
Poommetee Ketson
f9f3829bd2 Fix Viewport clear mode is bool instead of int, fixes #12202 2017-10-19 18:17:11 +07:00
haugenmitch
a41de1cc55 Formatting an unformatted hyperlink (#12226) 2017-10-19 12:53:11 +02:00
AlexHolly
776fbe749c Itemlist rmb now provides the same pos as Tree rmb 2017-10-18 14:56:38 +02:00
Rémi Verschelde
f52ab8d864 Merge pull request #12201 from SoWhich/master
Adjust openssl #defines to be libressl compatible

[ci skip]
2017-10-18 11:16:24 +02:00
Rémi Verschelde
215af244f3 Merge pull request #12194 from djrm/pr_visual_improvements
Improved viewport zoom and speed icons

[ci skip]
2017-10-18 10:22:24 +02:00
Rémi Verschelde
e4ec0d007c Merge pull request #12209 from neikeq/m
Mono: Fix warning about exported static fields
2017-10-18 08:40:13 +02:00
Ignacio Etcheverry
b1d106adb6 Mono: Fix warning about exported static fields 2017-10-18 08:34:17 +02:00
Rémi Verschelde
9bead2e06f Merge pull request #12208 from neikeq/l
Mono: Fix build with tools=no or target=release
2017-10-18 08:29:37 +02:00
Ignacio Etcheverry
fb63ee52fb Mono: Fix build with tools=no or target=release 2017-10-18 08:27:18 +02:00
Matthew Kunjummen
d154b846e8 Adjust openssl #defines to be libressl compatible
Corrected inability to build on systems using libressl instead of
openssl (e. g. void linux) by adjusting the #defines in
modules/openssl/stream_peer_openssl.cpp and
modules/openssl/stream_peer_openssl.h to check if
LIBRESSL_VERSION_NUMBER is defined (as done similarly in the following
patch in freebsd:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219362 ).
2017-10-17 21:06:39 -05:00
Daniel J. Ramirez
e119337ef4 Improved viewport zoom and speed icons 2017-10-17 17:10:34 -05:00
Gilles Roudiere
907970aab6 Restored files mode 2017-10-18 00:05:08 +02:00
Gilles Roudiere
fc02605b49 Fixes snapping and replaces the _draw_canvas by forward_canvas_draw 2017-10-18 00:01:59 +02:00
Rémi Verschelde
bac99b6811 Merge pull request #12121 from Paulb23/editor_settings_undo_redo
Separated Editor settings and Scene undo redo stack
2017-10-17 21:29:41 +02:00
Rémi Verschelde
fb7428e797 Merge pull request #12178 from neikeq/k
Export attribute fixes and improvements
2017-10-17 21:29:19 +02:00
Marcelo Fernandez
2baf54526b Fix BSD compile issues 2017-10-17 16:50:41 +00:00
Ignacio Etcheverry
6e6b455d1f Export attribute fixes and improvements
- Allow non-public fields to be exported as well (to avoid confusion).
- Set PROPERTY_HINT_RESOURCE_TYPE for resource derived fields.
- Support enums and automatically fill PROPERTY_HINT_ENUM's hint_string for enum fields.
2017-10-17 14:42:13 +02:00
Ignacio Etcheverry
6e960c7d6b Merge pull request #12172 from neikeq/j
Take self-contained mode into consideration
2017-10-17 13:57:12 +02:00
Gilles Roudiere
7f5f87133d Merge pull request #12128 from Zylann/zoom_speed_icon
Added icon under zoom/speed indicator bar
2017-10-17 13:13:38 +02:00
Andreas Haas
3efb584ff5 Merge pull request #12173 from homer666/visualscript-variable-list-equals-space
VisualScript: Add space after "=" sign in variable list
2017-10-17 13:10:08 +02:00
Thomas Herzog
8c50bc369e Merge pull request #11953 from touilleMan/pluginscript
[GDnative] add pluginscript \o/
2017-10-17 13:08:41 +02:00
homer666
6880cad471 (VS) Add space after "=" sign in variable list 2017-10-17 21:45:39 +11:00
Ignacio Etcheverry
1bafd0e33a Take self-contained mode into consideration 2017-10-17 11:36:19 +02:00
Emmanuel Leblond
e715be0f0a
[GDnative] add pluginscript \o/ 2017-10-17 10:50:13 +02:00
Rémi Verschelde
fe562cc113 Merge pull request #12169 from hi-ogawa/fix-directional-light-specular
Fix directional light specular
2017-10-17 09:50:26 +02:00
Hiroshi Ogawa
7ee7dec5a2 Fix directional light specular 2017-10-17 15:35:22 +09:00
Rémi Verschelde
1b2e09355e SCons: Disable server platform as it does not build
See #8361. [ci skip]
2017-10-17 07:56:04 +02:00
Rémi Verschelde
4fb5b1a211 Merge pull request #12161 from RandomShaper/fix-log-overflow
Fix formatting of debug log overflow
2017-10-16 23:42:44 +02:00
Rémi Verschelde
bc659323b7 Merge pull request #12160 from RandomShaper/fix-shader-parse
Fix crash in shader parsing
2017-10-16 23:40:26 +02:00
Pedro J. Estébanez
d645b80e46 Fix formatting of debug log overflow
Fixes #12087.
2017-10-16 22:10:11 +02:00
Pedro J. Estébanez
7764640f22 Fix crash in shader parsing
...that would happen if incorrect syntax was found just after an opening square bracket.

Fixes #12046.
2017-10-16 21:55:42 +02:00
Pedro J. Estébanez
807a84f7c9 Reset slider mouse state on hiding/removing
Resetting `grab.active`, but also `mouse_inside` so that after reappearing it must be hovered again -even if the mouse is still over it- in order to get a highlight. That is consistent to the way other controls in the engine, e.g. buttons, work.

Fixes #12130.
2017-10-16 20:59:25 +02:00
Rémi Verschelde
8de1dc7e9a Merge pull request #12138 from neikeq/i
Avoid adding built-in script path to csproj
2017-10-16 10:19:16 +02:00
Rémi Verschelde
c0293aca59 Merge pull request #12136 from neikeq/h
Improve signature of signal target generated function
2017-10-16 10:18:17 +02:00
Rémi Verschelde
edd881cd70 Merge pull request #12131 from touilleMan/nativescript-fix-loading
[Nativescript] fix crash when loading a library with missing godot_nativescript_init
2017-10-16 10:10:32 +02:00
Rémi Verschelde
ef0b6aecf3 Merge pull request #12141 from endragor/ios-sign-first
Sign iOS dylibs before packaging
2017-10-16 10:03:53 +02:00
Emmanuel Leblond
9c1f6c5db6
[Nativescript] fix crash when loading a library with missing godot_nativescript_init 2017-10-16 08:16:37 +02:00
Ruslan Mustakov
011d997840 Sign iOS dylibs before packaging
These changes allow to open the exported project in XCode and Run it
immediately to begin debugging. Before these changes you'd have to
sign GDNative libs and change Build Configuration manually.
2017-10-16 10:35:58 +07:00