Commit graph

2371 commits

Author SHA1 Message Date
Juan Linietsky
38ab47d2f9 Merge pull request #2865 from hurikhan/pr_fix_2791
Added additional token checks for the shader if..else.. statement.
2015-12-08 17:09:58 -03:00
Juan Linietsky
ff936c6b2e Merge pull request #2868 from akien-mga/pr-fix-can-move-to
Fix can_move_to and rename it for more clarity
2015-12-08 17:09:47 -03:00
Juan Linietsky
c26f66abde Merge pull request #2873 from neikeq/editor_layouts
Editor layouts menu
2015-12-08 17:09:38 -03:00
Juan Linietsky
17927cb705 Merge pull request #2877 from eska014/remove-builtin-aliases
Remove unexpected GDScript aliases for built-in types
2015-12-08 17:09:22 -03:00
Juan Linietsky
f93fbbe1d2 Merge pull request #2888 from TheHX/item_list_plugin
Make ItemListEditor plugin functional
2015-12-08 17:07:32 -03:00
Juan Linietsky
ee09c5dbd9 Merge pull request #2919 from TheHX/pr-groups-editor
Update Groups Editor
2015-12-08 17:07:05 -03:00
Juan Linietsky
b6d6c2220f Merge pull request #2922 from romulox-x/set_hidden
Added set_hidden method to Spatial and CanvasItem
2015-12-08 17:06:45 -03:00
Juan Linietsky
eff81965af Merge pull request #2956 from est31/add_system_wide_export_path
Add way to look for templates at system wide level too
2015-12-08 17:04:24 -03:00
Juan Linietsky
a6ac1fcd94 Merge pull request #2983 from koalefant/vector_ptr
Vector<>::_ptr is now typed and points to the beginning of the array rather than refcounting block
2015-12-08 17:02:13 -03:00
Juan Linietsky
afb895f197 Merge pull request #2993 from leezh/nrex-v0.1
updated the RegEx library nrex to v0.1
2015-12-08 17:00:27 -03:00
Juan Linietsky
1bcdea0804 Merge pull request #3018 from Ovnuniarchos/DampenIntegrator
Areas now calculate their dampenings the same way as their gravity.
2015-12-08 17:00:05 -03:00
Ovnuniarchos
43b2c9c7a4 Areas now calculate their dampenings the same way as their gravity. 2015-12-08 18:45:14 +01:00
Juan Linietsky
ecad3a285f better unique name resolution, as suggested i #3017 2015-12-08 11:33:30 -03:00
Juan Linietsky
9637460331 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-08 11:23:23 -03:00
Juan Linietsky
3c33b705d1 added option to add_child, to use the same deduplication convention as in the editor, closes #3017 2015-12-08 11:21:12 -03:00
Rémi Verschelde
2cc60386d8 Merge pull request #3005 from TheHX/pr-file-dialog
Better hidden folders display preferences for editor file dialogs
2015-12-07 20:40:58 +01:00
Rémi Verschelde
c667bde183 Merge pull request #3007 from neikeq/fix_line_edit
Fix LineEdit cursor
2015-12-07 20:39:43 +01:00
neikeq
f499fb6fcf Fix LineEdit cursor 2015-12-07 20:31:21 +01:00
Juan Linietsky
5e2f327d4b Merge branch 'master' of https://github.com/godotengine/godot 2015-12-07 11:51:01 -03:00
Juan Linietsky
8bdf2be4a6 -Webp include paths are broken, hacked them to work, fixes #2995 2015-12-07 11:50:00 -03:00
Juan Linietsky
7ba484bc74 some fixes
-fix compilation on tres/tscn on MSVC
-fixed theora playback performance, closes #3004
2015-12-06 20:22:45 -03:00
Franklin Sobrinho
42eef3cdc6 Better hidden folders display preferences for editor file dialogs 2015-12-06 19:35:31 -03:00
Rémi Verschelde
17a4ab992c Merge pull request #3002 from TheHX/pr-script-editor
Script Editor: maintain cursor column after duplicate a line
2015-12-06 21:59:59 +01:00
Franklin Sobrinho
b3ce127e31 Script Editor: maintain cursor column after duplicate a line 2015-12-06 15:34:09 -03:00
Franklin Sobrinho
118f3cdcf6 Update Groups Editor 2015-12-06 11:02:35 -03:00
Rémi Verschelde
145af960c8 Merge pull request #2999 from TheHX/pr-image-constructor
Add constructor for Image built-in type
2015-12-06 14:31:53 +01:00
Franklin Sobrinho
3c4b0236cb Add constructor for Image built-in type 2015-12-06 09:12:14 -03:00
Juan Linietsky
fe2a9bc746 optional streaming from thread for Theora 2015-12-05 23:16:41 -03:00
Juan Linietsky
3ecc9e07b7 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-05 14:19:19 -03:00
Juan Linietsky
200b7bb87c -Display on animation editor which keys are invalid and which tracks are unresolved
-Added a tool to clean up unresolved tracks and unused keys
2015-12-05 14:18:22 -03:00
Zher Huei Lee
d957749179 updated nrex documentation 2015-12-04 22:19:53 +00:00
Rémi Verschelde
98c54827ae Merge pull request #2989 from StraToN/2967fix_button_breaklines
Set default destination filename of imported font
2015-12-04 22:32:44 +01:00
Rémi Verschelde
96a39edeaf Merge pull request #2990 from neikeq/file_dialog_refresh
Add refresh button to file dialogs
2015-12-04 22:29:46 +01:00
Zher Huei Lee
d0ddf150d9 updated the RegEx library nrex to v0.1
After implementing unit testing to nrex I caught and fixed some errors
so it should behave more like Python's RegEx In addition, I've added
version numbering so it should be able to tell if the library needs
updating. Here are a list of changes:

- Fixed zero count quantifiers failing.
- Fixed infinite recursion if quantifying zero length token.
- Fixed `$` (as a string pattern on its own) not matching.
- Fixed look behind rewinding beyond the start of the string.
- Added support for alternative back reference format `\g{1}` similar to
Python. This allows digits to be used immediately after back references.
- Number of capture groups are still limited to 9 by default but can now
be manually set, with option for no limit at all. (Python has no limit)
- Curly bracket quantifiers `{0}` no longer interpreted as a literal
string if previous token is not quantifiable. (Python behaviour)
2015-12-04 21:18:41 +00:00
neikeq
71eaa2d547 Add refresh button to file dialogs 2015-12-04 19:33:30 +01:00
Julian Murgia - StraToN
6ffe1fff2d Set default destination filename of imported font to be input font filename
if destination filename was ".fnt" (ie. no filename set by user)
2015-12-04 19:29:27 +01:00
Rémi Verschelde
5b0dcab3e8 Merge pull request #2987 from neikeq/fix_save_empty
Fix 'Save Scene' doing nothing on new scenes
2015-12-04 17:15:34 +01:00
neikeq
a5947161ef Fix 'Save Scene' doing nothing on new scenes 2015-12-04 16:51:36 +01:00
Juan Linietsky
35fa048af5 missing pngs 2015-12-04 10:22:45 -03:00
Juan Linietsky
504e464c8a -Missing files in new webp version 2015-12-04 10:21:22 -03:00
Juan Linietsky
bb392bde16 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-04 10:19:58 -03:00
Juan Linietsky
da113fe40d -Upgraded webp to a MUCH newer version. Hoping it fixes some bugs in the process. Keeping old version just in case for now.
-Added ability to convert xml and tscn scenes to binary on export, makes loading of larger scenes faster
2015-12-04 10:18:28 -03:00
Rémi Verschelde
9457211f8f Fix wrong index being used to populate r_results
Regression from f33d9da.
2015-12-04 09:31:01 +01:00
koalefant
c7b730c655 Vector<>::_ptr is now typed and points to the beginning of array rather than reference count block 2015-12-04 05:58:56 +01:00
Franklin Sobrinho
d6d335f20c Make ItemListEditor plugin functional 2015-12-03 15:17:56 -03:00
Rémi Verschelde
145b8e52e6 Merge pull request #2981 from TheHX/pr-editor-crash
Fix editor crash after closing scene with certain types of nodes
2015-12-03 16:51:02 +01:00
Franklin Sobrinho
868832bca7 Fix editor crash after closing scene with certain types of nodes 2015-12-03 12:42:58 -03:00
Rémi Verschelde
68d3438a93 Merge pull request #2975 from neikeq/help_scroll_top
Fix help view not scrolling to the top
2015-12-02 16:16:18 +01:00
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