Commit graph

2314 commits

Author SHA1 Message Date
Juan Linietsky
064fd762fa Merge branch 'master' of https://github.com/godotengine/godot 2015-12-02 11:17:01 -03:00
Juan Linietsky
4b1f0afb01 -several fixes to Android to work better on Tegra 3/4 devices, uses 16 bits FBOs so all 2D shader effects should now work in every single Android device. 2015-12-02 11:15:48 -03:00
Rémi Verschelde
ce52160429 Merge pull request #2973 from neikeq/fix_help_copy
Fix RichTextLabel selection copying
2015-12-02 08:25:47 +01:00
neikeq
c5698fc28e Fix RichTextLabel copy never called 2015-12-02 08:19:33 +01:00
Rémi Verschelde
7ac31a7209 Merge pull request #2969 from neikeq/fix_bracket_complete
Fix auto bracket completion disabled on newly open scripts
2015-12-01 21:01:48 +01:00
Rémi Verschelde
7b9dd1ea76 Merge pull request #2968 from neikeq/line_duplicate
Fix script editor not clonning down last line
2015-12-01 21:01:05 +01:00
neikeq
fc7e313074 Fix script editor not clonning down last line 2015-12-01 19:43:51 +01:00
neikeq
4cbabf9691 ScriptTextEditor: fix auto bracket completion not enabled 2015-12-01 17:43:18 +01:00
Rémi Verschelde
f1f3468f70 Merge pull request #2890 from neikeq/cl_select_children
Allow selecting CanvasLayer children in canvas editor
2015-12-01 11:20:48 +01:00
Rémi Verschelde
e4e7e8f396 Merge pull request #2963 from akien-mga/pr-opus-arm-opt
Enable opus ARM optimisations only on ARM
2015-12-01 10:18:41 +01:00
Rémi Verschelde
99e7641f3d Enable opus ARM optimisations only on ARM
i.e. do not enable it for x86.
Fixes #2962.
2015-12-01 09:34:51 +01:00
Rémi Verschelde
3aa0d0e9fd Merge pull request #2938 from koalefant/master
Break into GDScript debugger when new() fails
2015-11-30 07:50:22 +01:00
Rémi Verschelde
25a2f33093 Merge pull request #2955 from koalefant/missing-colon
GDScript: fixed highlighting of the next line when colon is missing
2015-11-30 00:09:52 +01:00
koalefant
e52d211b61 GDScript: fixed highlighting of the next line when colon is missing 2015-11-29 23:45:28 +01:00
Rémi Verschelde
5e0419012a Merge pull request #2954 from koalefant/release-debug-release
scons: enabled debug symbols for x11 when using platform=release_debug and debug_release=yes together
2015-11-29 22:25:10 +01:00
Rémi Verschelde
aaca687d21 Merge pull request #2953 from koalefant/png-leak
Fixed leak when saving PNG-s
2015-11-29 22:15:57 +01:00
koalefant
bd396c5cfa Enabled debug symbols for x11 when using platform=release_debug and debug_release=yes together 2015-11-29 20:56:27 +01:00
koalefant
2355e1c3b8 Fixed leak when saving PNG-s 2015-11-29 20:11:42 +01:00
Rémi Verschelde
0093d374ac Merge pull request #2951 from koalefant/text-editor
Script Editor: automatic indentation after a colon
2015-11-29 17:41:19 +01:00
koalefant
c93a005fb6 Script Editor: automatic indentation after a colon 2015-11-29 17:13:29 +01:00
admix
b2508ca879 Break into GDScript debugger when new() fails 2015-11-29 17:02:52 +01:00
Rémi Verschelde
b0dbcccb6c Merge pull request #2950 from bojidar-bg/reference-rect2-aabb
Edit documentation for AABB and Rect2.
2015-11-29 15:26:11 +01:00
Bojidar Marinov
12f2c1378a Edit documentation for AABB and Rect2.
Docs for AABB were already present, but had a few mistakes.
2015-11-29 15:56:40 +02:00
Bojidar Marinov
c81c671131 Run -doctool on existing documentation
Also, s/vecor/vector/
2015-11-29 15:38:47 +02:00
Juan Linietsky
46c5fda91d -orphan resource explorer dialog + tools menu 2015-11-29 01:08:31 -03:00
Juan Linietsky
68aaa0f813 Merge branch 'master' of https://github.com/godotengine/godot 2015-11-28 20:57:23 -03:00
Juan Linietsky
7aa39b7cae -Fixed bug with scene inheritance, should work again
-Proper .tscn and .tres parsing, should work, please test well!
2015-11-28 20:56:14 -03:00
Rémi Verschelde
68c56f81f9 Merge pull request #2940 from TheHX/pr-error-message
Fix error messages when closing the editor
2015-11-28 21:28:35 +01:00
Franklin Sobrinho
553ec52300 Fix message - ERROR: get_path: Condition ' !is_inside_tree() ' is true - when closing the editor 2015-11-28 16:58:10 -03:00
Rémi Verschelde
280d72eb8b Merge pull request #2937 from koalefant/master
fixed crash when creating new object with wrong number of arguments (rebased)
2015-11-28 18:15:47 +01:00
admix
bc998c9195 fixed crash when creating new object with wrong number of arguments 2015-11-28 17:30:59 +01:00
Rémi Verschelde
e4c872a260 Merge pull request #2936 from TheHX/pr-container
Add container automatic update when moving a child node
2015-11-28 17:16:54 +01:00
Franklin Sobrinho
43e1b879d0 Add container automatic update when moving a child node 2015-11-28 13:05:39 -03:00
Rémi Verschelde
274b17b636 Merge pull request #2932 from TheHX/pr-editor-help-scroll
Fix editor help scroll to result
2015-11-28 00:15:02 +01:00
Franklin Sobrinho
493d3c22ca Fix editor help scroll to result 2015-11-27 20:11:49 -03:00
Rémi Verschelde
d2f9155995 Merge pull request #2927 from akien-mga/pr-references-okam
Replace hardcoded references to Okam Studio by Godot Engine
2015-11-27 23:59:58 +01:00
Rémi Verschelde
a98eafe3cc Merge pull request #2930 from vnen/cleaner-opus-build
Clean up Opus build command arguments
2015-11-27 23:58:41 +01:00
George Marques
4057907cf4 Remove redundant Opus directive definition
Clean up the build command line another extra bit.
2015-11-27 19:59:50 -02:00
George Marques
fc0c4c6175 Remove Opus extra includes
Remove the extra directories to include that were needed by the Opus
library. Now the lib includes more specific paths to avoid those.
2015-11-27 19:59:13 -02:00
Rémi Verschelde
0fd20e1002 Update copyright header in ios xcode templates 2015-11-27 19:34:55 +01:00
Rémi Verschelde
55d56d9b7c Replace hardcoded references to Okam Studio by Godot Engine
Since the engine development is now independent.
Fixes #2836.
2015-11-27 18:54:09 +01:00
Rémi Verschelde
ed4738fbed Merge pull request #2926 from Magurosenbei/shader_language_function_validation_fix
Bug Fix #2541: Shader language function validation logic
2015-11-27 14:55:49 +01:00
Andrea Chua
67a1c3f136 Bug Fix #2541: Shader language function validation logic
ensures that it finds the correct function to validate.
2015-11-27 21:27:06 +08:00
Rémi Verschelde
d1a07ee28b Merge pull request #2891 from TheHX/fix_matrix_property
Fix property editor Matrix3 and Matrix32 editing
2015-11-26 23:38:21 +01:00
Rémi Verschelde
82413bd2a1 Merge pull request #2921 from est31/error_if_no_export_to
Print error if no export destination has been passed
2015-11-26 23:06:13 +01:00
est31
523b67e740 Print error if no export destination has been passed 2015-11-26 22:35:27 +01:00
Rémi Verschelde
772900c4ff Merge pull request #2918 from TheHX/pr-function-parameters
Add script auto-completion for function parameters
2015-11-26 13:58:09 +01:00
Franklin Sobrinho
69a6524adf Add script auto-completion for function parameters 2015-11-26 09:40:13 -03:00
Rémi Verschelde
f8b8f7b873 Merge pull request #2912 from TheHX/pr-mesh-import-plugin
Better import mesh warnings
2015-11-25 14:41:41 +01:00
Franklin Sobrinho
adf082a006 Better import mesh warnings 2015-11-25 10:28:46 -03:00