aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8217 from bojidar-bg/gdscript-fix-keyword-callRémi Verschelde2017-07-253-141/+263
|\ | | | | Make GDScript allow some keywords as identifiers
| * Make GDScript allow some keywords as identifiersBojidar Marinov2017-07-233-141/+263
| | | | | | | | | | Fixes #8085 Added some comments around the use of is_token_literal, as discussed.
* | Merge pull request #9833 from RandomShaper/fix-node-crashRémi Verschelde2017-07-251-0/+5
|\ \ | | | | | | Fix Node::move_child() crash if moving to the end plus one
| * | Fix Node::move_child() crash if moving to the end plus onePedro J. Estébanez2017-07-251-0/+5
| | | | | | | | | | | | Fixes #9820.
* | | Merge pull request #9830 from RandomShaper/fix-9692Rémi Verschelde2017-07-251-1/+1
|\ \ \ | | | | | | | | Fix crash in Space2DSW::test_body_motion()
| * | | Fix crash in Space2DSW::test_body_motion()Pedro J. Estébanez2017-07-251-1/+1
| |/ / | | | | | | | | | Fixes #9692.
* | | Merge pull request #9827 from sowfelicity/master-clipboardRémi Verschelde2017-07-251-2/+14
|\ \ \ | |/ / |/| | Workaround to allow pasting unicode characters from X selection.
| * | Workaround to allow pasting unicode characters from X selection.Jia Wang2017-07-251-2/+14
|/ / | | | | | | | | Fixes #2491. Fixes #9787.
* | Merge pull request #9822 from karroffel/nativescript-doublefreeThomas Herzog2017-07-251-0/+2
|\ \ | | | | | | [NativeScript] bound ` to ClassDB
| * | [NativeScript] bound `new` to ClassDBKarroffel2017-07-251-0/+2
| | |
* | | Merge pull request #9712 from BastiaanOlij/fix_checking_framebufferJuan Linietsky2017-07-241-6/+2
|\ \ \ | | | | | | | | add missing framebuffer check
| * | | add missing framebuffer checkBastiaanOlij2017-07-201-6/+2
| | | |
* | | | Merge pull request #9746 from Noshyaar/labelRémi Verschelde2017-07-241-8/+8
|\ \ \ \ | | | | | | | | | | Label: add auto_height
| * | | | Label: add auto_heightPoommetee Ketson2017-07-211-8/+8
| | | | |
* | | | | Merge pull request #9821 from karroffel/nativescript-doublefreeThomas Herzog2017-07-241-2/+11
|\ \ \ \ \ | | |_|/ / | |/| | | [GDNative] basic OS detection
| * | | | [GDNative] basic OS detectionKarroffel2017-07-241-2/+11
|/ / / /
* | | | Merge pull request #9791 from bojidar-bg/6087-add-global-local-convRémi Verschelde2017-07-244-0/+32
|\ \ \ \ | | | | | | | | | | Add .to_local/.to_global methods on Node2D and Spatial
| * | | | Add .to_local/.to_global methods on Node2D and SpatialBojidar Marinov2017-07-234-0/+32
| | |_|/ | |/| | | | | | | | | | | | | | Those are just helpers around get_global_transform().affine_inverse().xform() and get_global_transform().xform(). Closes #6087
* | | | 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-2005/+2542
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | [GDNative] new GDNative API
| * | | | | [GDNative] new GDNative APIKarroffel2017-07-2450-2005/+2542
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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