Commit Graph

10179 Commits

Author SHA1 Message Date
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
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
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
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
Ignacio Etcheverry 132c6deb28 Merge pull request #12104 from akien-mga/monosgen-2
mono: Request monosgen-2 explicitly via pkg-config
2017-10-16 04:32:47 +02:00
Ignacio Etcheverry 967335b969 Avoid adding built-in script path to csproj 2017-10-16 04:26:13 +02:00
Ignacio Etcheverry 8ed3247a63 Improve signature of signal target generated function 2017-10-16 04:19:36 +02:00
Ignacio Etcheverry 1a9efb417a Merge pull request #12135 from neikeq/g
Re-write SignalAwaiter implementation
2017-10-16 03:58:51 +02:00
Ignacio Etcheverry 63369ec306 Re-write SignalAwaiter implementation
Old implementation had issues where you could only await on the same signal of the same source once.
2017-10-16 03:54:23 +02:00
Rémi Verschelde 0d0cb01f33 Merge pull request #12126 from cbscribe/kcc_vsdocs2
[DOCS] Various VisualScript* nodes

[ci skip]
2017-10-15 23:04:32 +02:00
Chris Bradfield 6160591d2c Merge pull request #12124 from Kaukamieli/Particles2D
[DOCS] documented and edited Particles2D
2017-10-15 14:01:26 -07:00
Kaukamieli 6de19415a6 [DOCS] documented and edited Particles2D 2017-10-15 23:57:12 +03:00
Marc Gilleron 59e6a27da1 Added icon under zoom/speed indicator bar 2017-10-15 21:20:51 +02:00
Chris Bradfield ec0ade0dde [DOCS] Various VisualScript* nodes 2017-10-15 11:50:45 -07:00
Rémi Verschelde 0c9d201044 Merge pull request #11407 from toger5/selection_override_color
added option to keep font color on selection + use consistent selection color in help (fixes: #11501)
2017-10-15 20:49:38 +02:00
Rémi Verschelde e498f017fa Merge pull request #11428 from MillionOstrich/filesystem-dock-folders
Filesystem dock folder handling
2017-10-15 20:48:20 +02:00
Rémi Verschelde 61a26dc23e Merge pull request #11927 from Zylann/freelook_interpolation_fix
Freelook interpolation fixes
2017-10-15 20:40:16 +02:00
David Saltares 62ba7a1eb0 [DOCS] Document GridMap
[ci skip]
2017-10-15 20:38:38 +02:00
Rémi Verschelde fedd3f0cc6 Merge pull request #11989 from minifigmaster125/export-fix
Fix export(float ...) so that step is .01
2017-10-15 20:24:43 +02:00
Rémi Verschelde ba91747efe Merge pull request #12045 from vonzimr/master
Add an option to clear recent scenes in the 'Open Recent' submenu
2017-10-15 20:23:54 +02:00
Rémi Verschelde 1abab7b964 Merge pull request #12060 from mutato/windows_folder_creation_fix
DirAccessWindows: fix wrong path given to CreateDirectoryW, fixes #12019
2017-10-15 20:22:13 +02:00
Rémi Verschelde 38ba70f2f5 Merge pull request #12069 from Noshyaar/pr-vslerp
VisualScript: add inverse_lerp & range_lerp
2017-10-15 20:20:49 +02:00
Rémi Verschelde a851546845 Merge pull request #12074 from J08nY/fix/use-bin-name
Use binary names instead of absolute paths in calls to OS::execute.
2017-10-15 20:20:34 +02:00