summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Travis: Disable OSX builds, they create too much backlogRémi Verschelde2017-12-061-3/+3
| | | | | Travis CI has not enough OSX build nodes allocated for open source projects, so we often have to wait several hours (up to a full day) for builds to start.
* Merge pull request #14318 from endragor/compile-sdk-version-26Rémi Verschelde2017-12-061-1/+1
|\ | | | | Update Android compileSdkVersion to 26
| * Update Android compileSdkVersion to 26Ruslan Mustakov2017-12-061-1/+1
| |
* | Merge pull request #14013 from qichunren/fix_project_rename_lost_focusRémi Verschelde2017-12-061-1/+2
|\ \ | | | | | | Fixed project name line edit lost input focus in project rename dialog.
| * | Fixed project name line edit lost input focus.qichunren2017-12-061-1/+2
| | |
* | | Merge pull request #14008 from vnen/export-icon-splashRémi Verschelde2017-12-061-0/+12
|\ \ \ | |/ / |/| | Export icon and splash images directly to final package
| * | Export icon and splash images directly to final packageGeorge Marques2017-12-051-0/+12
| | | | | | | | | | | | | | | They need to bypass the path remapping to be loaded as images during the start routine.
* | | Moves the guides colors to editor settingsGilles Roudiere2017-12-052-1/+2
| | |
* | | Merge pull request #14000 from mhilbrunner/issue-13950Rémi Verschelde2017-12-0517-35/+22
|\ \ \ | |/ / |/| | Improve slang, especially in user-visible parts. Closes #13950.
| * | Improve slang, especially in user-visible partsUnknown2017-12-0517-35/+22
| | |
* | | Make sure the scene warning of changes may be lost is only for scenes, fixes ↵Juan Linietsky2017-12-051-1/+1
|/ / | | | | | | #13970
* | Fix a little mistake in a setting name (rulers->guides)Gilles Roudiere2017-12-051-1/+1
| |
* | Merge pull request #13454 from YeldhamDev/about_richtextRémi Verschelde2017-12-052-12/+7
|\ \ | | | | | | Changed EditorAbout's TextEdits to RichTextLabels
| * | Changed EditorAbout's TextEdits to RichTextLabels.Michael Alexsander Silva Dias2017-12-012-12/+7
| | |
* | | Merge pull request #13959 from groud/editable_rulers_colorsRémi Verschelde2017-12-051-1/+1
|\ \ \ | | | | | | | | Makes editable the guides color
| * | | Makes editable the rulers colorGilles Roudiere2017-12-031-1/+1
| | | |
* | | | Merge pull request #13964 from Krakean/richtextlabel_fix_deselection_bugRémi Verschelde2017-12-051-0/+11
|\ \ \ \ | | | | | | | | | | Rich Text Label: fixed deselection issue
| * | | | Rich Text Label: fixed deselection issueDmitry Koteroff2017-12-041-0/+11
| | | | |
* | | | | Merge pull request #13992 from ISylvox/substract-to-subtractRémi Verschelde2017-12-0510-16/+16
|\ \ \ \ \ | | | | | | | | | | | | Fix Typo: Substract to Subtract
| * | | | | Fixed typo: substract to subtractIndah Sylvia2017-12-0510-16/+16
| | | | | |
* | | | | | Merge pull request #13989 from vnen/gdnative-singletonRémi Verschelde2017-12-051-2/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | GDNative: Save singletons only if there's a change
| * | | | | | GDNative: Save singletons only if there's a changeGeorge Marques2017-12-051-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensures that the Project Settings are saved only if the list of singletons actually changed.
* | | | | | | Merge pull request #13973 from willnationsdev/centercontainer-docsRémi Verschelde2017-12-051-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [DOCS] CenterContainer methods completed
| * | | | | | | [DOCS] CenterContainer method descriptionsWill Nations2017-12-041-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #13977 from waldson/fix-stop-scene-always-activeAndreas Haas2017-12-051-1/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Fix stop button always enabled
| * | | | | | | Fix stop button always enabled (issue #13933)Waldson Patrício2017-12-041-1/+4
| | | | | | | |
* | | | | | | | Merge pull request #13943 from willnationsdev/scenestate-docsChris Bradfield2017-12-041-0/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [DOCS] SceneState method descriptions added.
| * | | | | | | | [DOCS] SceneState method descriptions added.Will Nations2017-12-041-0/+24
| | | | | | | | |
* | | | | | | | | Merge pull request #13945 from willnationsdev/packedscene-docsChris Bradfield2017-12-041-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [DOCS] PackedScene member, method, and class descriptions.
| * | | | | | | | | [DOCS] PackedScene member/method/class descs.Will Nations2017-12-041-0/+10
| |/ / / / / / / /
* | | | | | | | | Merge pull request #13974 from willnationsdev/colorpickerbutton-docsChris Bradfield2017-12-041-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [DOCS] ColorPickerButton member/method descs
| * | | | | | | | | [DOCS] ColorPickerButton member/method descsWill Nations2017-12-041-1/+4
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13979 from willnationsdev/windowdialog-docsChris Bradfield2017-12-041-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [DOCS] WindowDialog member descriptions
| * | | | | | | | | [DOCS] WindowDialog member descriptionsWill Nations2017-12-041-0/+2
| |/ / / / / / / /
* | | | | | | | | Do not cancel event if no need to cancel it. Fixes problem with GUI in 3D.Juan Linietsky2017-12-041-2/+2
| | | | | | | | |
* | | | | | | | | i18n: Fix instructions for adding new languageRémi Verschelde2017-12-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13972. [ci skip]
* | | | | | | | | Added a higher level wrapper for proxy textureJuan Linietsky2017-12-043-0/+97
| | | | | | | | |
* | | | | | | | | -Implemented Proxy Textures (needed to solve the problem with ViewportTexture)Juan Linietsky2017-12-0415-14/+109
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | -Properly use hierarchy to initialize resources local to scene (solves problem of GUI in 3D)
* | | | / / / / Script Editor: Use first non-whitespace comment delimiter.Andreas Haas2017-12-041-2/+7
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | As suggested by @neikeq in https://github.com/godotengine/godot/pull/13489#issuecomment-348690816
* | | | | | | Merge pull request #13961 from groud/rulers_by_defaultJuan Linietsky2017-12-041-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Make rulers on by default
| * | | | | | Make rulers on by defaultGilles Roudiere2017-12-041-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #13775 from YeldhamDev/filedialog_iconRémi Verschelde2017-12-044-7/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed FileDialog's "parent folder" button not having a texture
| * | | | | | Fixed FileDialog's "parent folder" button not having a texture.Michael Alexsander Silva Dias2017-12-024-7/+6
| | | | | | |
* | | | | | | Merge pull request #13829 from goodyttoor/masterRémi Verschelde2017-12-045-11/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Some untranslated UI strings
| * | | | | | | Some untranslated UI stringsUnknown2017-12-025-11/+11
| | | | | | | |
* | | | | | | | Make auto switch to remote scene tree opt-inRémi Verschelde2017-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The performance cost is too high for now, so it should be opt-in for users who really need it all the time. Fixes #13833.
* | | | | | | | Merge pull request #13431 from MarianoGnu/tilesetRémi Verschelde2017-12-037-91/+98
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Several TileMap Fixes
| * | | | | | | TileMap FixesMariano Suligoy2017-12-027-91/+98
| | | | | | | |
* | | | | | | | Disable invariant gl_Position to workaround Mesa bug 100316Rémi Verschelde2017-12-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13450, though it would be worth reverting if/when the Mesa bug is fixed.
* | | | | | | | Merge pull request #13919 from BastiaanOlij/fix_y_oversampleRémi Verschelde2017-12-031-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Forgot to apply oversampling to Y