summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9808 from MednauN/masterRémi Verschelde2017-07-241-21/+21
|\ | | | | Fix switching SRGB extension happen before binding of texture
| * Fix switching SRGB extension happen before binding of textureEvgeny Zuev2017-07-241-21/+21
| | | | | | | | | | | | Previously, texture parameter `_TEXTURE_SRGB_DECODE_EXT` was changed before the call of `glBindTexture`, which caused modification of previously bound texture instead of desired one. Now it's changed after `glBindTexture`.
* | Merge pull request #9819 from kubecz3k/collisionobj-shape-apiRémi Verschelde2017-07-244-0/+55
|\ \ | | | | | | expose missing CollisionShape API for CollisionObject
| * | expose missing CollisionShape API for CollisionObjectJakub Grzesik2017-07-244-0/+55
|/ /
* | Merge pull request #9817 from RameshRavone/patch-2Thomas Herzog2017-07-241-0/+1
|\ \ | | | | | | GDNative register_property
| * | GDNative register_propertyRamesh Ravone2017-07-241-0/+1
|/ /
* | Merge pull request #9814 from karroffel/nativescript-doublefreeThomas Herzog2017-07-242-3/+3
|\ \ | | | | | | [NativeScript] forgot to uncomment userdata return
| * | [NativeScript] forgot to uncomment userdata returnKarroffel2017-07-242-3/+3
| | |
* | | Merge pull request #9809 from karroffel/nativescript-doublefreeThomas Herzog2017-07-241-35/+1
|\| | | |/ |/| [NativeScript] fix double free but on exit
| * [NativeScript] fix double free but on exitKarroffel2017-07-241-35/+1
| |
* | Merge pull request #9807 from Noshyaar/pr-dfRémi Verschelde2017-07-241-0/+1
|\ \ | | | | | | EditorNode: fix missing distraction-free tooltip
| * | EditorNode: fix missing distraction-free tooltipPoommetee Ketson2017-07-241-0/+1
| | |
* | | Merge pull request #9764 from Noshyaar/pr-fix2Rémi Verschelde2017-07-2426-72/+69
|\ \ \ | | | | | | | | Add object type hint for docs
| * | | Add object type hint for docsPoommetee Ketson2017-07-2326-74/+71
| | | |
* | | | Merge pull request #9802 from vnen/fix-uwp-buildRémi Verschelde2017-07-241-1/+1
|\ \ \ \ | | | | | | | | | | UWP: Fix build issue caused by atomic operations
| * | | | UWP: Fix build issue caused by atomic operationsGeorge Marques2017-07-231-1/+1
| | |/ / | |/| |
* | | | Merge pull request #9804 from karroffel/gdnative-rewriteThomas Herzog2017-07-2450-2007/+2544
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| [GDNative] new GDNative API
| * | [GDNative] new GDNative APIKarroffel2017-07-2450-2007/+2544
|/ / | | | | | | | | | | | | | | | | | | | | This adds GDNative as a separate class type. It can be used to interface with native libraries by using "native calls", which can be registered by modules (and in future other GDNative libraries?). It also reworks the currently called "GDNativeScript" into a "NativeScript" that just makes use of the new GDNative instead of it being the component that implements that functionality.
* | small grammar fixJuan Linietsky2017-07-231-3/+3
| |
* | -Ability to set default import presets for typeJuan Linietsky2017-07-2312-223/+348
| | | | | | | | | | | | -More presets for scene importer -Option in scene importer to export root nodes as separate scenes -Fixed MeshInstance preview
* | Merge pull request #9795 from marcelofg55/masterRémi Verschelde2017-07-231-73/+31
|\ \ | | | | | | Fix Right-Click (Ctrl-Click) on OS X
| * | Fix Right-Click (Ctrl-Click) on OS XMarcelo Fernandez2017-07-231-73/+31
| | |
* | | Merge pull request #9794 from Noshyaar/pr-impdRémi Verschelde2017-07-233-1/+10
|\ \ \ | |/ / |/| | Suppress get_edited_scene_root error
| * | Suppress get_edited_scene_root errorPoommetee Ketson2017-07-233-1/+10
| | |
* | | Requesting for dictionary keys also respects insertion order, closes #9161Juan Linietsky2017-07-231-0/+21
| | |
* | | Merge pull request #9718 from endragor/ptrcall-fixesThomas Herzog2017-07-231-28/+28
|\ \ \ | |/ / |/| | Use specific size for numeric types in ptrcall
| * | Use specific size for numeric types in ptrcallRuslan Mustakov2017-07-201-28/+28
| | | | | | | | | | | | | | | | | | The script system does not provide information about specific int sizes, so we should establish convention to use the largest size (64 bits). For real types double is always used.
* | | Merge pull request #9765 from Noshyaar/pr-clangRémi Verschelde2017-07-2326-26/+24
|\ \ \ | | | | | | | | Clang-formatting *.cpp and *.h (some files excluded)
| * | | Clang-formatting *.cpp and *.h (some files excluded)Poommetee Ketson2017-07-2229-29/+27
| | |/ | |/|
* | | Merge pull request #9790 from Noshyaar/pr-reqRémi Verschelde2017-07-231-2/+1
|\ \ \ | | | | | | | | EditorNode: request_attn when behind other windows
| * | | EditorNode: request_attn when behind other windowsPoommetee Ketson2017-07-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | The current version requests attention only when minimized which might not work as expected when it's not minimized but doesn't have focus.
* | | | Merge pull request #9788 from Zylann/freelook_modifierRémi Verschelde2017-07-232-29/+37
|\ \ \ \ | | | | | | | | | | Added configurable modifier key to activate freelook
| * | | | Added configurable modifier key to activate freelookMarc Gilleron2017-07-232-29/+37
| |/ / /
* | | | Merge pull request #9776 from Noshyaar/pr-spriteRémi Verschelde2017-07-231-13/+0
|\ \ \ \ | | | | | | | | | | Sprite: fix disconnect nonexistent signal
| * | | | Sprite: fix disconnect nonexistent signalPoommetee Ketson2017-07-231-13/+0
| | | | |
* | | | | Merge pull request #9774 from Noshyaar/pr-aboutRémi Verschelde2017-07-234-174/+285
|\ \ \ \ \ | | | | | | | | | | | | Move About dialog to editor_about.cpp
| * | | | | Move About dialog to editor_about.cppPoommetee Ketson2017-07-234-174/+285
| |/ / / /
* | | | | Merge pull request #9773 from Noshyaar/pr-tabsRémi Verschelde2017-07-232-1/+18
|\ \ \ \ \ | | | | | | | | | | | | Tabs: expose tab_close_display_policy property
| * | | | | Tabs: expose tab_close_display_policy propertyPoommetee Ketson2017-07-232-1/+18
| |/ / / /
* | | | | Merge pull request #9772 from Noshyaar/pr-classxmlRémi Verschelde2017-07-231-9/+15
|\ \ \ \ \ | | | | | | | | | | | | Docs: fix broken ref tags
| * | | | | Docs: fix broken ref tagsPoommetee Ketson2017-07-221-9/+15
| |/ / / /
* | | | | Merge pull request #9771 from Noshyaar/pr-rstRémi Verschelde2017-07-231-8/+17
|\ \ \ \ \ | | | | | | | | | | | | Docs: ignore tags inside code,codeblock tag
| * | | | | Docs: ignore tags inside code,codeblock tagPoommetee Ketson2017-07-221-8/+17
| |/ / / /
* | | | | Merge pull request #9770 from eska014/html5-focusRémi Verschelde2017-07-233-31/+94
|\ \ \ \ \ | | | | | | | | | | | | Implement input focus behavior in HTML5
| * | | | | Implement input focus behavior in HTML5L. Krause2017-07-223-31/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Key and mouse events are only consumed if canvas is focused - NOTIFICATION_WM_MOUSE_ENTER, _MOUSE_EXIT, _FOCUS_IN and _FOCUS_OUT are emitted
* | | | | | Merge pull request #9762 from Paulb23/_scipt_close_tab_selection_issue_8400Rémi Verschelde2017-07-231-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed script tab selection on file close, issue 8400
| * | | | | | Fixed script tab selection on file close, issue 8400Paulb232017-07-221-1/+4
| | | | | | |
* | | | | | | Merge pull request #9761 from Noshyaar/pr-fixRémi Verschelde2017-07-231-2/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | ScriptEditor: suppress get_child errors
| * | | | | | | ScriptEditor: suppress get_child errorsPoommetee Ketson2017-07-221-2/+12
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #9758 from vnen/fix-vs-returnRémi Verschelde2017-07-231-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | VS: Fix return value for user-defined functions