maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
11345 commits 10 branches 35 tags 1.1 GiB
Commit graph

11345 commits

This branch
This branch
All branches
Author SHA1 Message Date
Waldson Patrício c6f28925e2 Add method to set main screen plugin icon 2017-12-06 19:31:25 -03:00
Juan Linietsky a496dd4d38 Created internal usage flag to remove non editor properties from doc, closes #13334 2017-12-06 17:16:25 -03:00
Juan Linietsky 8b41ebf784 Merge branch 'master' of https://github.com/godotengine/godot 2017-12-06 16:46:13 -03:00
Juan Linietsky 431dfc1458 Attempt to see if this can solve the problem with #13338 2017-12-06 16:41:19 -03:00
Rémi Verschelde e0c00efb99 Travis: Disable OSX builds, they create too much backlog 
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.
 2017-12-06 19:25:17 +01:00
Rémi Verschelde e7b7e7b7b0
Merge pull request #14318 from endragor/compile-sdk-version-26 
Update Android compileSdkVersion to 26
 2017-12-06 19:14:31 +01:00
Juan Linietsky e8494f7ab7 Fixed rim lighting glitch, closes #13340, closes #13986 2017-12-06 14:30:49 -03:00
Ruslan Mustakov b697444bc8 Update Android compileSdkVersion to 26 2017-12-06 22:35:15 +07:00
Rémi Verschelde a8ae46e143
Merge pull request #14013 from qichunren/fix_project_rename_lost_focus 
Fixed project name line edit lost input focus in project rename dialog.
 2017-12-06 07:59:10 +01:00
Rémi Verschelde c11ea8a2d0
Merge pull request #14008 from vnen/export-icon-splash 
Export icon and splash images directly to final package
 2017-12-06 07:47:00 +01:00
qichunren 7d1c3b5391 Fixed project name line edit lost input focus. 2017-12-06 11:24:01 +08:00
George Marques 85baa41c7a
Export icon and splash images directly to final package 
They need to bypass the path remapping to be loaded as images during
the start routine.
 2017-12-05 21:13:58 -02:00
Gilles Roudiere 7b02f5591d Moves the guides colors to editor settings 2017-12-05 21:44:52 +01:00
Rémi Verschelde 9a96a2a06e
Merge pull request #14000 from mhilbrunner/issue-13950 
Improve slang, especially in user-visible parts. Closes #13950.
 2017-12-05 21:14:29 +01:00
Juan Linietsky 1587f45c25 Make sure the scene warning of changes may be lost is only for scenes, fixes #13970 2017-12-05 13:26:45 -03:00
Unknown fd1b94e307 Improve slang, especially in user-visible parts 2017-12-05 15:41:38 +01:00
Gilles Roudiere 03c1b6be23 Fix a little mistake in a setting name (rulers->guides) 2017-12-05 10:45:27 +01:00
Rémi Verschelde 8040359458
Merge pull request #13454 from YeldhamDev/about_richtext 
Changed EditorAbout's TextEdits to RichTextLabels
 2017-12-05 09:26:59 +01:00
Rémi Verschelde 1702a19bf0
Merge pull request #13959 from groud/editable_rulers_colors 
Makes editable the guides color
 2017-12-05 09:23:52 +01:00
Rémi Verschelde 7c0de08d38
Merge pull request #13964 from Krakean/richtextlabel_fix_deselection_bug 
Rich Text Label: fixed deselection issue
 2017-12-05 09:23:40 +01:00
Rémi Verschelde c7f9d8a059
Merge pull request #13992 from ISylvox/substract-to-subtract 
Fix Typo: Substract to Subtract
 2017-12-05 09:16:10 +01:00
Rémi Verschelde 3a503f62af
Merge pull request #13989 from vnen/gdnative-singleton 
GDNative: Save singletons only if there's a change
 2017-12-05 09:10:00 +01:00
Rémi Verschelde e218dde3f4
Merge pull request #13973 from willnationsdev/centercontainer-docs 
[DOCS] CenterContainer methods completed
 2017-12-05 09:03:26 +01:00
Andreas Haas 74969b4535
Merge pull request #13977 from waldson/fix-stop-scene-always-active 
Fix stop button always enabled
 2017-12-05 07:59:52 +00:00
Indah Sylvia 3996a05324 Fixed typo: substract to subtract 2017-12-05 11:34:46 +07:00
George Marques 6af42c536a
GDNative: Save singletons only if there's a change 
Ensures that the Project Settings are saved only if the list of
singletons actually changed.
 2017-12-05 00:25:29 -02:00
Chris Bradfield 5938466c84
Merge pull request #13943 from willnationsdev/scenestate-docs 
[DOCS] SceneState method descriptions added.
 2017-12-04 14:57:58 -08:00
Will Nations c4c812de62 [DOCS] CenterContainer method descriptions 2017-12-04 16:57:47 -06:00
Chris Bradfield 82c59bcf69
Merge pull request #13945 from willnationsdev/packedscene-docs 
[DOCS] PackedScene member, method, and class descriptions.
 2017-12-04 14:56:57 -08:00
Chris Bradfield 6b7fc288fb
Merge pull request #13974 from willnationsdev/colorpickerbutton-docs 
[DOCS] ColorPickerButton member/method descs
 2017-12-04 14:54:16 -08:00
Chris Bradfield 03b0257ca7
Merge pull request #13979 from willnationsdev/windowdialog-docs 
[DOCS] WindowDialog member descriptions
 2017-12-04 14:52:52 -08:00
Juan Linietsky 7459ade298 Do not cancel event if no need to cancel it. Fixes problem with GUI in 3D. 2017-12-04 17:36:28 -03:00
Will Nations d3305a048c [DOCS] SceneState method descriptions added. 2017-12-04 14:29:04 -06:00
Will Nations 9f341971c9 [DOCS] PackedScene member/method/class descs. 2017-12-04 14:28:37 -06:00
Will Nations e0ced07fff [DOCS] ColorPickerButton member/method descs 2017-12-04 14:27:45 -06:00
Will Nations 8a079fbdcc [DOCS] WindowDialog member descriptions 2017-12-04 14:26:10 -06:00
Rémi Verschelde 56fe852bae i18n: Fix instructions for adding new language 
Closes #13972.
[ci skip]
 2017-12-04 21:10:19 +01:00
Juan Linietsky 5868754b01 Added a higher level wrapper for proxy texture 2017-12-04 16:54:17 -03:00
Waldson Patrício 606401331a Fix stop button always enabled (issue #13933) 2017-12-04 16:48:46 -03:00
Juan Linietsky d438ac0aed -Implemented Proxy Textures (needed to solve the problem with ViewportTexture) 
-Properly use hierarchy to initialize resources local to scene (solves problem of GUI in 3D)
 2017-12-04 15:56:17 -03:00
Andreas Haas faaa012b84
Script Editor: Use first non-whitespace comment delimiter. 
As suggested by @neikeq in https://github.com/godotengine/godot/pull/13489#issuecomment-348690816
 2017-12-04 18:33:43 +01:00
Dmitry Koteroff 0a1a5396ec Rich Text Label: fixed deselection issue 2017-12-04 18:46:20 +03:00
Juan Linietsky 1a317a39ed
Merge pull request #13961 from groud/rulers_by_default 
Make rulers on by default
 2017-12-04 11:45:04 -03:00
Gilles Roudiere c2a7d186bd Make rulers on by default 2017-12-04 15:39:12 +01:00
Rémi Verschelde 055c5600c8
Merge pull request #13775 from YeldhamDev/filedialog_icon 
Fixed FileDialog's "parent folder" button not having a texture
 2017-12-04 10:49:11 +01:00
Rémi Verschelde a31735ad36
Merge pull request #13829 from goodyttoor/master 
Some untranslated UI strings
 2017-12-04 10:46:49 +01:00
Rémi Verschelde a7c244564e Make auto switch to remote scene tree opt-in 
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.
 2017-12-04 10:25:35 +01:00
Rémi Verschelde 58930cf7ec
Merge pull request #13431 from MarianoGnu/tileset 
Several TileMap Fixes
 2017-12-03 21:58:04 +01:00
Rémi Verschelde 9b9fcb1977 Disable invariant gl_Position to workaround Mesa bug 100316 
Fixes #13450, though it would be worth reverting if/when the Mesa bug is fixed.
 2017-12-03 15:05:39 +01:00
Rémi Verschelde 889d262736
Merge pull request #13919 from BastiaanOlij/fix_y_oversample 
Forgot to apply oversampling to Y
 2017-12-03 12:43:21 +01:00