Commit graph

10388 commits

Author SHA1 Message Date
Rémi Verschelde
0b8139ae6b Merge pull request #12406 from kubecz3k/distance-typo
fix a 'proximity_fade_distacne' typo in material

[ci skip]
2017-10-25 20:41:35 +02:00
Jakub Grzesik
5a83fc50ec fix a 'proximity_fade_distacne' typo in material 2017-10-25 20:27:52 +02:00
Chris Bradfield
c9e6168db0 Merge pull request #12375 from NathanWarden/cubemap_docs
[DOCS] CubeMap
2017-10-25 08:54:15 -07:00
Gilles Roudiere
3504bb70a4 Merge pull request #12383 from AntiSC2/master
Fix margin with tree drawing
2017-10-25 10:12:26 +02:00
Rémi Verschelde
3842848d76 Merge pull request #12394 from sheepandshepherd/locale_name
Add a function to get the full name of a locale

[ci skip]
2017-10-25 09:25:44 +02:00
sheepandshepherd
1cd40be491 Add a function to get the full name of a locale 2017-10-25 01:13:17 -05:00
Nathan Warden
e0b2a74a14 [DOCS] CubeMap 2017-10-24 21:46:37 -05:00
Jakob Sinclair
708982bee1 Fix margin with tree drawing
Fixes @akien-mga point brought up in #12352

Signed-off-by: Jakob Sinclair <sinclair.jakob@mailbox.org>
2017-10-24 21:06:27 +02:00
Rémi Verschelde
552ed07cfd classref: Sync with current source
[ci skip]
2017-10-24 19:22:43 +02:00
Rémi Verschelde
847c55bcb1 Merge pull request #12365 from neikeq/p
Add ScriptLanguage::supports_builtin_mode and improve ScriptCreateDialog
2017-10-24 18:59:26 +02:00
Rémi Verschelde
b44fb58c90 Merge pull request #12378 from volzhs/fix-examplecode-editorimportplugin
Fix example code for EditorImportPlugin

[ci skip]
2017-10-24 18:57:32 +02:00
Rémi Verschelde
f74f27a66f Merge pull request #12377 from Cradmon/quickFix
Small fix in core/set.h and similar fix in core/map.h
2017-10-24 18:55:46 +02:00
volzhs
d15af2c290 Fix example code for EditorImportPlugin 2017-10-25 01:12:43 +09:00
Cradmon
8da9fd5d23 Small fix in core/set.h and similar fix in core/map.h 2017-10-24 15:59:54 +01:00
Ignacio Etcheverry
0268a95828 Merge pull request #12376 from neikeq/q
Exit after generating mono glue
2017-10-24 16:27:46 +02:00
Ignacio Etcheverry
63f58da054 Exit after generating mono glue 2017-10-24 16:18:47 +02:00
Ignacio Etcheverry
e218a13a64 Add ScriptLanguage::supports_builtin_mode and improve ScriptCreateDialog
- Make ScriptCreateDialog disable the built-in script checked button if the language does not support it.
- ScriptLanguage's get_template and make_template now receive the script path as class name if the the script language does not have named classes.
2017-10-24 15:48:58 +02:00
Thomas Herzog
4396712137 Merge pull request #12370 from jagt/fix-match-crash-in-editor
Fix editor crash when missing variable in pattern match dispatch.
2017-10-24 11:30:51 +02:00
Rémi Verschelde
4af59c5b3f Merge pull request #12340 from homer666/orbit-inertia-toned-down
Reduce default orbit inertia value

[ci skip]
2017-10-24 09:11:50 +02:00
Rémi Verschelde
fffaec9da9 Merge pull request #12372 from ISylvox/patch9rect-to-ninepatchrect
Finish Transition of Patch9Rect to NinePatchRect

[ci skip]
2017-10-24 09:10:00 +02:00
Indah Sylvia
79dda1350d Finished transition of Patch9Rect to NinePatchRect 2017-10-24 13:01:45 +07:00
Rémi Verschelde
16fde4c3b6 Merge pull request #12186 from DmitriySalnikov/ability_to_filter_locales_in_remaps_tab
Added the ability to filter the list of locales in the Remap tab.
2017-10-24 07:32:19 +02:00
jagt
822af935e3 fix editor crash when missing variable in pattern match dispatch 2017-10-24 13:07:21 +08:00
Ignacio Etcheverry
a897f7f606 Merge pull request #12364 from neikeq/o
Mono: Fix and cleanup build start errors
2017-10-24 01:17:36 +02:00
Ignacio Etcheverry
9905002fa6 Mono: Fix and cleanup build start errors 2017-10-24 00:49:44 +02:00
DimOkGamer
509f6f81ad Added the ability to filter the list of locales in the Remap tab. 2017-10-24 01:07:40 +03:00
Rémi Verschelde
3c69a40caf Merge pull request #12183 from marcelofg55/err_index
Improved *_FAIL_INDEX error macros to print the index/size
2017-10-23 23:26:34 +02:00
Rémi Verschelde
ad5613ec40 Merge pull request #12310 from Paulb23/toggle_highlight_current_line
Added setting to toggle current line highlighting
2017-10-23 23:25:11 +02:00
Rémi Verschelde
9f7887837a Merge pull request #12360 from volzhs/ttr-format
Fix warning message format for addon plugin

[ci skip]
2017-10-23 23:24:08 +02:00
Rémi Verschelde
c529fa6987 Merge pull request #12316 from mrezai/fix-disable-3d
Fix disable_3d=yes compile errors
2017-10-23 23:19:21 +02:00
Rémi Verschelde
8ef79ffe68 Merge pull request #12320 from mhilbrunner/issue-11994
Add _process(delta) to new script templates. Closes #11994.
2017-10-23 23:18:14 +02:00
Rémi Verschelde
19f83e57de Merge pull request #12334 from Zylann/tilemap_bresenham_paint
Use bresenham line in freehand tilemap painting to fill discontinuities
2017-10-23 23:14:45 +02:00
Rémi Verschelde
5b53cd1fc4 Merge pull request #12330 from Jerome67000/docs_basebutton
[DOCS] BaseButton

[ci skip]
2017-10-23 23:13:25 +02:00
Rémi Verschelde
4e0e513d5f Merge pull request #12341 from jagt/move-button-joy-enums
Move BUTTON and JOY constants to enums
2017-10-23 23:11:05 +02:00
volzhs
59cc6f2ff5 Fix warning message format for addon plugin 2017-10-24 05:31:26 +09:00
Rémi Verschelde
832a5369ef Merge pull request #12345 from Noshyaar/perf
Monitor: add checkbox to monitor list

[ci skip]
2017-10-23 20:23:55 +02:00
Poommetee Ketson
7f1d719c9a
Monitor: add checkbox to monitor list
so that users don't have to hold CTRL to select multiple entries.
2017-10-24 01:16:27 +07:00
Rémi Verschelde
7c18881808 Merge pull request #12343 from djrm/pr_improve_monitors
Improved monitors units and colors.
2017-10-23 20:06:23 +02:00
Rémi Verschelde
62f7f62999 Merge pull request #12355 from marcelofg55/osx_vsync3
Implemented vsync OS functions for OS X

[ci skip]
2017-10-23 19:11:53 +02:00
Marcelo Fernandez
ad4000d376 Implemented vsync OS functions for OS X 2017-10-23 13:26:33 -03:00
Rémi Verschelde
804cab31de Merge pull request #12350 from kubecz3k/ray-mask-bit
missing set/get_collision_mask_bit() for RayCast

[ci skip]
2017-10-23 14:49:47 +02:00
Jakub Grzesik
8f054d519f missing set/get_collision_mask_bit() for RayCast
in the same fastion how it's implemented in Area or Bodies
2017-10-23 14:31:58 +02:00
Rémi Verschelde
eda5f16821 Merge pull request #12349 from BastiaanOlij/add_SSAOBlur_binds
Missing binds for SSAOBlur

[ci skip]
2017-10-23 12:41:59 +02:00
Bastiaan Olij
e72a6644dc Missing binds for SSAOBlur enum caused issues compiling GDNative cpp_bindings 2017-10-23 21:27:12 +11:00
Daniel J. Ramirez
a97c8504fb Improved monitors units and colors. 2017-10-23 02:11:02 -05:00
Rémi Verschelde
07ab60a8d7 Update AUTHORS and DONORS with current data
[ci skip]
2017-10-23 08:40:59 +02:00
Rémi Verschelde
9b3983aea0 Merge pull request #12342 from godotengine/revert-12296-ggx_rename
Revert "Rename Schlick GGX to GGX."

[ci skip]
2017-10-23 07:43:21 +02:00
Rémi Verschelde
abea816e54 Revert "Rename Schlick GGX to GGX." 2017-10-23 07:42:36 +02:00
Rémi Verschelde
346326528b Merge pull request #12333 from neikeq/ñ
Mono: Prevent raising exceptions in native code
2017-10-23 07:40:32 +02:00
Rémi Verschelde
489d1b7eb3 Merge pull request #12332 from robertdhernandez/AStar-Memory-Leak-Fix
Fixed memory leak with AStar class
2017-10-23 07:39:32 +02:00