Commit Graph

18468 Commits

Author SHA1 Message Date
Hein-Pieter van Braam f8eaa2fc59
Merge pull request #24824 from hpvb/fix-24752
Use 'release_debug' for mono export templates
2019-01-07 19:49:22 +01:00
Hein-Pieter van Braam dd766bae78 Use 'release_debug' for mono export templates
Because we don't actually ship 'debug' templates to users make sure
the mono exporter picks the correct 'data' directory for export
templates.

This fixes #24752
2019-01-07 18:19:35 +00:00
Rémi Verschelde bcecf56267 Bump version to 3.1-beta
Release freeze is now active, only major bug fixes will be considered.
2019-01-07 17:13:59 +01:00
Rémi Verschelde ac8ae09bc3 i18n: Sync translation template with current source
Misc fixes to source strings.
2019-01-07 16:57:52 +01:00
Rémi Verschelde d2b17d8d60 i18n: Sync translations with Weblate 2019-01-07 16:42:05 +01:00
Rémi Verschelde db33b03f49
Merge pull request #24814 from YeldhamDev/animtree_editor_statemach_scrolls
Move scrolls in the StateMachine editor inside the panel
2019-01-07 15:11:05 +01:00
Rémi Verschelde 2e8ca4710a
Merge pull request #24807 from guilhermefelipecgs/fix_state_machine_scroll
Fix state machine scroll
2019-01-07 15:10:53 +01:00
Rémi Verschelde dab650fcaa
Merge pull request #24740 from OBKF/update-bullet-physics
Update Bullet physics to commit 126b676
2019-01-07 15:08:41 +01:00
Juan Linietsky a3a537c2cf Fix background color rendering on GLES2 (linear should not be used) 2019-01-07 10:52:24 -03:00
Oussama 22b7c9dfa8 Update Bullet to the latest commit 126b676 2019-01-07 12:30:35 +01:00
clayjohn a6722cf362 clarified and filled out particles material doc 2019-01-07 12:26:36 +01:00
Rémi Verschelde a15620c83e doc: Fix wrong references found by Sphinx and new makerst.py 2019-01-07 12:15:01 +01:00
Rémi Verschelde 698728f1c2
Merge pull request #24640 from PJB3005/18-12-28-makerst-2
makerst.py refactor.
2019-01-07 10:11:54 +01:00
Rémi Verschelde 26fddb77be doc: Fix wrong references found by new makerst.py
Thanks @PJB3005
2019-01-07 10:06:12 +01:00
Rémi Verschelde 7d22e162e7
Merge pull request #24806 from timoschwarzer/camera2d-process-mode
Add process_mode property to Camera2D
2019-01-07 08:19:18 +01:00
Rémi Verschelde 55bfb05df2
Merge pull request #24804 from timoschwarzer/doc-gdscript
Add missing documentation for @GDScript
2019-01-07 08:16:14 +01:00
Michael Alexsander Silva Dias 67ac8fe359 Move scrolls in the StateMachine editor inside the panel 2019-01-07 00:21:48 -02:00
Rémi Verschelde 3873f84548
Merge pull request #24777 from volzhs/font-kerning
Fix font kerning
2019-01-06 18:33:20 +01:00
Timo Schwarzer c06db1dd18
Add process_mode property to Camera2D
This allows the user to choose if the camera should update in
_process or _physics_process.
2019-01-06 15:44:17 +01:00
Guilherme Felipe 59df3ca911 Fix state machine scroll 2019-01-06 12:35:12 -02:00
Timo Schwarzer 5c71d43302
Add missing documentation for @GDScript 2019-01-06 14:35:40 +01:00
Rémi Verschelde 53516d7a9e
Merge pull request #24608 from PJB3005/18-12-26-control-docs
Improve documentation of Control.
2019-01-06 13:15:15 +01:00
Rémi Verschelde ba2e7f9bc6
Merge pull request #24801 from timoschwarzer/24773-fix-down-smooth-scroll
Fix jumping when scrolling down fast with smooth scroll enabled
2019-01-06 13:10:03 +01:00
Timo Schwarzer 3b2e03cf0b
Fix jumping when scrolling down fast with smooth scroll enabled
Fixes #24773
2019-01-06 10:22:38 +01:00
Rémi Verschelde 0e25c32a77
Merge pull request #24797 from timoschwarzer/fix-code-completion
Fix code completion on nodes in current scene
2019-01-06 10:02:10 +01:00
Timo Schwarzer 56000929fd
Fix code completion on nodes in current scene 2019-01-05 23:17:02 +01:00
Rémi Verschelde 42a5b7545a
Merge pull request #24791 from humblers/blend-gles2
Change blend equations for GLES2 canvasitems
2019-01-05 20:40:51 +01:00
Rémi Verschelde c1f6852a6a
Merge pull request #24792 from Paulb23/wrap_zoom_issue_23896
Fix text edit wrapping beyond control size, issue 23896
2019-01-05 18:22:43 +01:00
Paulb23 411df08711 Fix text edit wrapping beyond control size, issue 23896 2019-01-05 16:58:54 +00:00
Daeil Kim ecf520b70e Change blend equation for canvasitems 2019-01-06 00:57:52 +09:00
Rémi Verschelde 021421e180
Merge pull request #24782 from SoIAS/duplicated_code_24781
Removed duplicated code in animation_track_editor.cpp
2019-01-05 11:29:09 +01:00
Rémi Verschelde 07014864d0
Merge pull request #24778 from Rubonnek/fix-out-of-bounds
Fixed out of bounds axis name access
2019-01-05 10:35:21 +01:00
volzhs a9b7843dca Fix font kerning 2019-01-05 09:44:47 +09:00
Wilson E. Alvarez caf5e92121
Fixed out of bounds axis name access 2019-01-04 19:34:14 -05:00
Dawid Wdowiak 855a82211f Removed duplicated code 2019-01-04 22:18:54 +01:00
Hein-Pieter van Braam 5e6c6f3bb7
Merge pull request #21708 from hpvb/fix-21242v2
String[size()] should return a default constructed CharType
2019-01-04 20:57:22 +01:00
Rémi Verschelde b6cf37cb57
Merge pull request #24767 from godotengine/revert-24546-fix_blend_tree
Revert "Fix blend tree generating wrong node names"
2019-01-04 19:47:56 +01:00
Rémi Verschelde 495e40cff8
Revert "Fix blend tree generating wrong node names" 2019-01-04 19:45:39 +01:00
Rémi Verschelde 1ba0b2bc0b
Merge pull request #24741 from timoschwarzer/24697-fix-autocomplete-segfault-in-inner-classes
Fix segfault when trying to autocomplete in inner classes
2019-01-04 19:41:24 +01:00
Rémi Verschelde 2c118d754d
Merge pull request #24689 from BrodyEller/master
Fix viewport not updating with make_current() for Camera2D
2019-01-04 19:04:13 +01:00
Hein-Pieter van Braam ac99ed3cda String[size()] should return a default constructed CharType
As per the C++ standard 21.3.4.1 for std::string:
Returns: If pos < size(), returns data()[pos]. Otherwise, if pos ==
size(), the const version returns charT(). Otherwise, the behavior is
undefined.

Since the behavior is undefined Godot now does the same thing for const
and non-const versions of operator[].

This fixes #21242 and fixes #22221.
2019-01-04 17:48:03 +00:00
Pieter-Jan Briers c93c279867 Improve documentation of Control. 2019-01-04 18:12:24 +01:00
Rémi Verschelde bd6ab5360f
Merge pull request #24592 from volzhs/android-etc
Make possible to use ETC texture format with GLES3 on Android
2019-01-04 16:49:49 +01:00
Rémi Verschelde 5809be9641
Merge pull request #24582 from Xrayez/script-encrypt
Bring back script encryption in export preset
2019-01-04 16:34:38 +01:00
Rémi Verschelde 70de8ca9a9
Merge pull request #24585 from Xrayez/fix-crash-hex-number
Fix crash when checking empty string for valid hex number
2019-01-04 16:19:29 +01:00
Rémi Verschelde d8f0087dc8
Merge pull request #24568 from Shinryuuji/fix-wrong-texture-array-target
Fix wrong default target for sampler2DArray
2019-01-04 16:14:29 +01:00
Rémi Verschelde bc9899fb9f
Merge pull request #24504 from harrisyu/AtlasCheckPixelOpaque
Fix #24470 Atlas Texture with margin setting cause error in editor.
2019-01-04 16:11:37 +01:00
Rémi Verschelde 1504c96112
Merge pull request #24539 from BastiaanOlij/override_gl_position
Override GL_position
2019-01-04 15:40:05 +01:00
Rémi Verschelde 99c4faf837
Merge pull request #24575 from nekomatata/android-curve-texture
Fixed CurveTexture with GLES3 on Android
2019-01-04 15:31:08 +01:00
Rémi Verschelde d54894ffae
Merge pull request #24647 from WindyDarian/gltf_morph_fix
Fix for blend shape incorrectly scaling skinned gltf mesh
2019-01-04 15:21:38 +01:00