aboutsummaryrefslogtreecommitdiff
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* this failed in msvc, didn't in linux and mingwAriel Manzur2015-12-202-5/+2
* Merge pull request #3090 from neikeq/fix_3088Rémi Verschelde2015-12-162-14/+40
|\
| * Fix Remove Item option in TileSet pluginIgnacio Etcheverry2015-12-152-14/+40
* | small fix for undo redoJuan Linietsky2015-12-163-5/+20
* | added labels to sections and propertiesJuan Linietsky2015-12-161-3/+16
* | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-157-9/+32
|\|
| * Merge pull request #3080 from akien-mga/pr-input-presetsRémi Verschelde2015-12-151-2/+3
| |\
| | * Prevent deleting input presets as it does not workRémi Verschelde2015-12-151-2/+3
| * | Merge pull request #3083 from TheHX/pr-file-dialogRémi Verschelde2015-12-156-7/+29
| |\ \ | | |/ | |/|
| | * Add editor setting for display mode on file dialog and filesystem dockFranklin Sobrinho2015-12-156-7/+29
* | | -split view of property editor and editor settingsJuan Linietsky2015-12-156-22/+218
|/ /
* | Merge pull request #3076 from neikeq/rename_actionsRémi Verschelde2015-12-146-39/+123
|\ \
| * | Forbid renaming input presetsIgnacio Etcheverry2015-12-141-1/+2
| * | Added input actions renamingIgnacio Etcheverry2015-12-146-39/+122
| |/
* / Avoid project manager from processing gamepad inputFranklin Sobrinho2015-12-142-0/+8
|/
* Fix editor layouts broken after 9a7ff65Ignacio Etcheverry2015-12-141-2/+1
* Merge pull request #3074 from neikeq/editor_layouts_patchRémi Verschelde2015-12-142-1/+8
|\
| * Editor layout dialog: name field grabs focus on popupIgnacio Etcheverry2015-12-142-1/+8
* | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-147-26/+53
|\ \
| * \ Merge pull request #3073 from TheHX/pr-editor-dialogsRémi Verschelde2015-12-142-11/+18
| |\ \ | | |/ | |/|
| | * Implement double-click on remaining dialogsFranklin Sobrinho2015-12-142-11/+18
| * | Merge pull request #3061 from TheHX/pr-tree-dialogsRémi Verschelde2015-12-142-11/+10
| |\ \
| | * | Double-click item for reparent and choose a node in NodePath dialogFranklin Sobrinho2015-12-132-11/+10
| | |/
| * | Merge pull request #3065 from TheHX/pr-array-editorRémi Verschelde2015-12-143-4/+25
| |\ \
| | * | Fix array editor NodePath being relative to editorFranklin Sobrinho2015-12-133-4/+25
| | |/
* | | replaced :var by :Variant in documentation, fixes #2897Juan Linietsky2015-12-141-0/+1
* | | do not open dominant script if external editor is selected, fixes #3067Juan Linietsky2015-12-141-0/+3
|/ /
* | -scenes are properly reloaded when a dependency changes, fixes #2896Juan Linietsky2015-12-135-1/+123
* | fixed and improved selection and list selection, closes #2852Juan Linietsky2015-12-135-102/+184
* | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-1310-16184/+0
|\ \
| * \ Merge pull request #3052 from akien-mga/pr-cleanup-docJuan Linietsky2015-12-1310-16184/+0
| |\ \ | | |/ | |/|
| | * Move documentation python tools to doc/tools folderRémi Verschelde2015-12-1210-16184/+0
* | | added binary API to StreamPeer, fixes #2863Juan Linietsky2015-12-134-7/+6
|/ /
* | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-134-7/+6
|\ \
| * \ Merge pull request #3045 from TheHX/pr-nav-meshRémi Verschelde2015-12-131-1/+3
| |\ \
| | * | Fix crash caused by a empty NavigationMeshFranklin Sobrinho2015-12-121-1/+3
| * | | Merge pull request #3047 from eska014/fix-play-project-buttonRémi Verschelde2015-12-131-2/+2
| |\ \ \
| | * | | Fix "Play Project" buttoneska2015-12-081-2/+2
| * | | | Merge pull request #3053 from TheHX/pr-revert-3043Rémi Verschelde2015-12-132-4/+1
| |\ \ \ \
| | * | | | Remove last remaining variables of PR-3043Franklin Sobrinho2015-12-122-4/+1
* | | | | | fix zip exportJuan Linietsky2015-12-132-2/+4
|/ / / / /
* | | | | ability to export scene to zipJuan Linietsky2015-12-133-12/+91
* | | | | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-121-3/+13
|\| | | |
| * | | | Merge pull request #2933 from TheHX/pr-shader-loaderJuan Linietsky2015-12-121-3/+13
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix shader loading, making possible load .shd and .sgp from editorFranklin Sobrinho2015-11-271-3/+13
* | | | | no more time error, fixes #2892Juan Linietsky2015-12-121-0/+5
|/ / / /
* | | | better support for broken collada, fixes #2959Juan Linietsky2015-12-121-1/+5
* | | | fix broken mergeJuan Linietsky2015-12-122-15/+0
* | | | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-123-6/+19
|\ \ \ \
| * | | | Script debugger remains visible when using Debug->Show DebuggerFranklin Sobrinho2015-12-123-13/+20
| | |_|/ | |/| |