aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
|/
* 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
* | | | | Merge pull request #2953 from koalefant/png-leakRémi Verschelde2015-11-291-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed leak when saving PNG-s
| * | | | | Fixed leak when saving PNG-skoalefant2015-11-291-0/+1
| |/ / / /
* | | | | Merge pull request #2951 from koalefant/text-editorRémi Verschelde2015-11-293-1/+15
|\ \ \ \ \ | |/ / / / |/| | | | Script Editor: automatic indentation after a colon
| * | | | Script Editor: automatic indentation after a colonkoalefant2015-11-293-1/+15
|/ / / /
* | | | Merge pull request #2950 from bojidar-bg/reference-rect2-aabbRémi Verschelde2015-11-291-10/+29
|\ \ \ \ | | | | | | | | | | Edit documentation for AABB and Rect2.
| * | | | Edit documentation for AABB and Rect2.Bojidar Marinov2015-11-291-5/+18
| | | | | | | | | | | | | | | | | | | | Docs for AABB were already present, but had a few mistakes.
| * | | | Run -doctool on existing documentationBojidar Marinov2015-11-291-5/+11
|/ / / / | | | | | | | | | | | | Also, s/vecor/vector/
* | | | -orphan resource explorer dialog + tools menuJuan Linietsky2015-11-294-1/+226
| | | |
* | | | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-11-28261-1068/+1165
|\ \ \ \
| * \ \ \ Merge pull request #2940 from TheHX/pr-error-messageRémi Verschelde2015-11-281-1/+0
| |\ \ \ \ | | | | | | | | | | | | Fix error messages when closing the editor
| | * | | | Fix message - ERROR: get_path: Condition ' !is_inside_tree() ' is true - ↵Franklin Sobrinho2015-11-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | when closing the editor
| * | | | | Merge pull request #2937 from koalefant/masterRémi Verschelde2015-11-281-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | fixed crash when creating new object with wrong number of arguments (rebased)
| | * | | | | fixed crash when creating new object with wrong number of argumentsadmix2015-11-281-1/+4
| |/ / / / /
| * | | | | Merge pull request #2936 from TheHX/pr-containerRémi Verschelde2015-11-282-0/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | | Add container automatic update when moving a child node
| | * | | | Add container automatic update when moving a child nodeFranklin Sobrinho2015-11-282-0/+9
| |/ / / /
| * | | | Merge pull request #2932 from TheHX/pr-editor-help-scrollRémi Verschelde2015-11-282-2/+3
| |\ \ \ \ | | | | | | | | | | | | Fix editor help scroll to result
| | * | | | Fix editor help scroll to resultFranklin Sobrinho2015-11-272-2/+3
| | | | | |
| * | | | | Merge pull request #2927 from akien-mga/pr-references-okamRémi Verschelde2015-11-279-21/+63
| |\ \ \ \ \ | | | | | | | | | | | | | | Replace hardcoded references to Okam Studio by Godot Engine
| | * | | | | Update copyright header in ios xcode templatesRémi Verschelde2015-11-272-14/+56
| | | | | | |
| | * | | | | Replace hardcoded references to Okam Studio by Godot EngineRémi Verschelde2015-11-277-7/+7
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Since the engine development is now independent. Fixes #2836.
| * | | | | Merge pull request #2930 from vnen/cleaner-opus-buildRémi Verschelde2015-11-27236-1000/+995
| |\ \ \ \ \ | | |/ / / / | |/| | | | Clean up Opus build command arguments