aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* made the exclusion of nodes from joints optional, fixes #3015Juan Linietsky2015-12-084-5/+70
|
* better unique name resolution, as suggested i #3017Juan Linietsky2015-12-081-5/+1
|
* Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-085-9/+14
|\
| * Merge pull request #3005 from TheHX/pr-file-dialogRémi Verschelde2015-12-074-8/+13
| |\ | | | | | | Better hidden folders display preferences for editor file dialogs
| | * Better hidden folders display preferences for editor file dialogsFranklin Sobrinho2015-12-064-8/+13
| | |
| * | Merge pull request #3007 from neikeq/fix_line_editRémi Verschelde2015-12-071-1/+1
| |\ \ | | | | | | | | Fix LineEdit cursor
| | * | Fix LineEdit cursorneikeq2015-12-071-1/+1
| | | |
* | | | added option to add_child, to use the same deduplication convention as in ↵Juan Linietsky2015-12-083-19/+22
|/ / / | | | | | | | | | the editor, closes #3017
* | | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-077-7/+30
|\ \ \
| * | | some fixesJuan Linietsky2015-12-064-6/+5
| | | | | | | | | | | | | | | | | | | | -fix compilation on tres/tscn on MSVC -fixed theora playback performance, closes #3004
| * | | Merge pull request #3002 from TheHX/pr-script-editorRémi Verschelde2015-12-061-1/+3
| |\ \ \ | | | |/ | | |/| Script Editor: maintain cursor column after duplicate a line
| | * | Script Editor: maintain cursor column after duplicate a lineFranklin Sobrinho2015-12-061-1/+3
| |/ /
| * | Merge pull request #2999 from TheHX/pr-image-constructorRémi Verschelde2015-12-062-0/+22
| |\ \ | | | | | | | | Add constructor for Image built-in type
| | * | Add constructor for Image built-in typeFranklin Sobrinho2015-12-062-0/+22
| |/ /
* / / -Webp include paths are broken, hacked them to work, fixes #2995Juan Linietsky2015-12-0739-57/+57
|/ /
* | optional streaming from thread for TheoraJuan Linietsky2015-12-053-11/+138
| |
* | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-056-1/+23
|\|
| * Merge pull request #2989 from StraToN/2967fix_button_breaklinesRémi Verschelde2015-12-041-0/+4
| |\ | | | | | | Set default destination filename of imported font
| | * Set default destination filename of imported font to be input font filenameJulian Murgia - StraToN2015-12-041-0/+4
| | | | | | | | | | | | if destination filename was ".fnt" (ie. no filename set by user)
| * | Merge pull request #2990 from neikeq/file_dialog_refreshRémi Verschelde2015-12-044-0/+18
| |\ \ | | |/ | |/| Add refresh button to file dialogs
| | * Add refresh button to file dialogsneikeq2015-12-044-0/+18
| | |
| * | Merge pull request #2987 from neikeq/fix_save_emptyRémi Verschelde2015-12-041-1/+1
| |\ \ | | |/ | |/| Fix 'Save Scene' doing nothing on new scenes
| | * Fix 'Save Scene' doing nothing on new scenesneikeq2015-12-041-1/+1
| |/
* / -Display on animation editor which keys are invalid and which tracks are ↵Juan Linietsky2015-12-0519-20/+381
|/ | | | | | unresolved -Added a tool to clean up unresolved tracks and unused keys
* missing pngsJuan Linietsky2015-12-043-0/+0
|
* -Missing files in new webp versionJuan Linietsky2015-12-0468-0/+22829
|
* Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-042-6/+6
|\
| * Merge pull request #2981 from TheHX/pr-editor-crashRémi Verschelde2015-12-031-0/+4
| |\ | | | | | | Fix editor crash after closing scene with certain types of nodes
| | * Fix editor crash after closing scene with certain types of nodesFranklin Sobrinho2015-12-031-0/+4
| |/
| * Merge pull request #2975 from neikeq/help_scroll_topRémi Verschelde2015-12-021-6/+2
| |\ | | | | | | Fix help view not scrolling to the top
| | * Fix help view not scrolling to the topneikeq2015-12-021-6/+2
| | |
* | | -Upgraded webp to a MUCH newer version. Hoping it fixes some bugs in the ↵Juan Linietsky2015-12-04167-10945/+44584
|/ / | | | | | | | | | | 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
* | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-021-1/+1
|\ \
| * \ Merge pull request #2973 from neikeq/fix_help_copyRémi Verschelde2015-12-021-1/+1
| |\ \ | | | | | | | | Fix RichTextLabel selection copying
| | * | Fix RichTextLabel copy never calledneikeq2015-12-021-1/+1
| | |/
* | / -several fixes to Android to work better on Tegra 3/4 devices, uses 16 bits ↵Juan Linietsky2015-12-0211-8/+59
|/ / | | | | | | FBOs so all 2D shader effects should now work in every single Android device.
* | Merge pull request #2969 from neikeq/fix_bracket_completeRémi Verschelde2015-12-011-0/+1
|\ \ | | | | | | Fix auto bracket completion disabled on newly open scripts
| * | ScriptTextEditor: fix auto bracket completion not enabledneikeq2015-12-011-0/+1
| | |
* | | Merge pull request #2968 from neikeq/line_duplicateRémi Verschelde2015-12-011-2/+2
|\ \ \ | |_|/ |/| | Fix script editor not clonning down last line
| * | Fix script editor not clonning down last lineneikeq2015-12-011-2/+2
| |/
* | Merge pull request #2890 from neikeq/cl_select_childrenRémi Verschelde2015-12-011-9/+3
|\ \ | | | | | | Allow selecting CanvasLayer children in canvas editor
| * | Allow selecting CanvasLayer children in canvas editorneikeq2015-11-231-9/+3
| | |
* | | Merge pull request #2963 from akien-mga/pr-opus-arm-optRémi Verschelde2015-12-011-1/+2
|\ \ \ | | | | | | | | Enable opus ARM optimisations only on ARM
| * | | Enable opus ARM optimisations only on ARMRémi Verschelde2015-12-011-1/+2
| | | | | | | | | | | | | | | | i.e. do not enable it for x86. Fixes #2962.
* | | | Merge pull request #2938 from koalefant/masterRémi Verschelde2015-11-302-8/+8
|\ \ \ \ | | | | | | | | | | Break into GDScript debugger when new() fails
| * | | | Break into GDScript debugger when new() failsadmix2015-11-292-8/+8
| | | | |
* | | | | Merge pull request #2955 from koalefant/missing-colonRémi Verschelde2015-11-301-2/+4
|\ \ \ \ \ | | | | | | | | | | | | GDScript: fixed highlighting of the next line when colon is missing
| * | | | | GDScript: fixed highlighting of the next line when colon is missingkoalefant2015-11-291-2/+4
| |/ / / /
* | | | | Merge pull request #2954 from koalefant/release-debug-releaseRémi Verschelde2015-11-291-0/+2
|\ \ \ \ \ | | | | | | | | | | | | scons: enabled debug symbols for x11 when using platform=release_debug and debug_release=yes together
| * | | | | Enabled debug symbols for x11 when using platform=release_debug and ↵koalefant2015-11-291-0/+2
| |/ / / / | | | | | | | | | | | | | | | debug_release=yes together