godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,251 Commits 15 Branches 59 Tags 2.2 GiB
678563a3b9
Commit Graph

4251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juan Linietsky
678563a3b9 Merge branch 'master' of https://github.com/godotengine/godot 2016-06-09 22:07:19 -03:00
Juan Linietsky
8266cf46b5 Reverted a PR i don't understand how to find but fixes #5097 2016-06-09 22:05:41 -03:00
Juan Linietsky
ae1e43afef Merge pull request #5132 from godotengine/revert-5052-fix-label-min-size 
Revert "Fix min size bug of Label"
 2016-06-09 21:58:22 -03:00
Juan Linietsky
45d1ffd611 Revert "Fix min size bug of Label" 2016-06-09 21:57:38 -03:00
Juan Linietsky
f4ff30dff0 If a resource is delete from fs dialog, but the resource is currently loaded, 
clear the path of the resource. Fixes #5110
 2016-06-09 21:43:28 -03:00
Juan Linietsky
94a6ff3d7a -make freetype build for all platforms the same, default as builtin except on x11. 
closes #5119
 2016-06-09 21:28:07 -03:00
Juan Linietsky
d02261fc84 Disable asset library compilation if no openssl exists 2016-06-09 21:20:49 -03:00
Rémi Verschelde
a3890594fa Merge pull request #5124 from Paulb23/editor_help_focus_issues 
Fixed editor help focus issues and input propagation
 2016-06-09 20:43:48 +02:00
Rémi Verschelde
1dadaa4db3 Merge pull request #5123 from zaps166/fix-editorassetlibrary-crash 
EditorAssetLibrary: Don't call add_child() on uninitialized pointer
 2016-06-09 20:43:37 +02:00
volzhs
990956c4e0 add line spacing option to script and shader editor (#5105) 2016-06-09 20:43:19 +02:00
Paulb23
eb14373d69 Fixed editor help focus issues and input propagation 2016-06-09 18:26:47 +01:00
Błażej Szczygieł
73b93c9110 EditorAssetLibrary: Don't call add_child() on uninitialized pointer 
Fixes possible crash and fixes crash when using undefined sanitizer.
The "search_hb" is already added into "library_main" container.
 2016-06-09 19:10:06 +02:00
Rémi Verschelde
26d18b74ac i18n: Sync and merge translations with source 2016-06-09 17:33:24 +02:00
Rémi Verschelde
78856d537e Merge pull request #5115 from noidexe/master 
es.po base translation and es_AR.po complete translation
 2016-06-09 17:27:58 +02:00
Lisandro Lorea
ca764f8579 Merge pull request #1 from noidexe/es_AR 
Add es_AR.po. First complete draft.
 2016-06-09 02:42:41 +02:00
Lisandro Lorea
9349e747f6 Add es.po 
Right now it's just a copy of es_AR to be used as a 
template for a more neutral version.
 2016-06-09 02:41:51 +02:00
Lisandro Lorea
be71cb425b Add es_AR.po. First complete draft. 2016-06-09 02:02:29 +02:00
Juan Linietsky
f8f30662d9 -Ability to reload (and soft reload) tool scripts. Please test! 2016-06-08 20:00:52 -03:00
Rémi Verschelde
1bdb55831d Assetlib: Update link for renamed repository 2016-06-08 23:48:26 +02:00
Juan Linietsky
beabefe432 port changes from AnimatedSprite to AnimatedSprite3D 2016-06-08 18:03:06 -03:00
Juan Linietsky
c170589929 -properly use hidpi icons in hidpi, looks pretty! 2016-06-08 17:49:06 -03:00
Rémi Verschelde
73fa537472 Merge pull request #5111 from CowThing/classref-edit 
Filling in documentation
 2016-06-08 21:41:37 +02:00
CowThing
50de99f050 Filling in documentation 
Documentation for BoneAttachment, KinematicBody, ParallaxBackground,
ParallaxLayer, and TestCube
 2016-06-08 15:29:46 -04:00
Rémi Verschelde
aa200ef735 Merge pull request #5107 from Paulb23/caret_blink_update_issue_5100 
Caret blink no longer updates when hidden, issue 5100
 2016-06-08 15:51:06 +02:00
Juan Linietsky
1f2ad872cc Fixed some options in assetlib 2016-06-08 10:17:16 -03:00
Paulb23
e260e3872c Caret blink no longer updates when hidden, issue 5100 2016-06-08 14:02:39 +01:00
Juan Linietsky
b847aec864 Added asset library on project manager for templates 2016-06-08 09:25:47 -03:00
Juan Linietsky
47944098c2 Merge pull request #5007 from bojidar-bg/asset-store 
Update asset library editor plugin, adding a bit new functionality and fixes
 2016-06-08 07:58:06 -03:00
Juan Linietsky
32fa1e3ee6 Merge pull request #5088 from Paulb23/breakpoint_marker_scaling 
Improved breakpoint marker position, and scales with font size
 2016-06-08 07:55:29 -03:00
Juan Linietsky
1b3fd498a3 Merge pull request #5089 from Hinsbart/resdock_copy_path 
Add a "copy path" item to the filesystem dock context menu.
 2016-06-08 07:55:04 -03:00
Juan Linietsky
3d95c82669 Merge pull request #5090 from akien-mga/glew-1.13.0 
Upgrade embedded GLEW to version 1.13.0
 2016-06-08 07:54:31 -03:00
Juan Linietsky
040c87ea7b Merge pull request #5093 from DimOkGamer/more_translatable_strings 
Fixed localization in file dialogs
 2016-06-08 07:54:05 -03:00
Juan Linietsky
732e5be3ff Merge pull request #5094 from pkowal1982/master 
Improved Blender/Collada shadeless->unshaded import
 2016-06-08 07:53:19 -03:00
Rémi Verschelde
ac4fdb391e Merge pull request #5103 from J08nY/issue-5102 
RtAudio: proper under/overflow warning
 2016-06-08 12:38:23 +02:00
J08nY
39260f9dca
RtAudio: proper under/overflow warning 
fix #5102
 2016-06-08 12:25:40 +02:00
Rémi Verschelde
9f94d3fbac Merge pull request #5101 from djrm/new_icons 
Regenerated icons with the new faster exporter, Added and fixed some …
 2016-06-08 08:47:14 +02:00
Daniel J. Ramirez
1d6b0836d3 Regenerated icons with the new faster exporter, Added and fixed some icons 2016-06-08 01:32:09 -05:00
Juan Linietsky
d61b91cbe0 -Heavily improved editor startup and exit performance 2016-06-07 22:10:09 -03:00
Rémi Verschelde
5bed0af65e GLEW: Update to upstream version 1.13.0 (pristine) 
This removes a custom redefinition of glewGetProcAddress,
which was apparently necessary for older Macs with buggy OpenGL
(see #5087).

The added source files are as provided in the upstream tarball.
 2016-06-08 00:17:54 +02:00
Rémi Verschelde
768e925271 GLEW: Define static + enabled and includes via SCons 
This allows us not to have to hack our definitions in the upstream files,
making it easier to upgrade to newer versions in the future.

For the include paths to work, the headers are moved to a GL subfolder to
match their upstream location.
 2016-06-08 00:16:27 +02:00
Rémi Verschelde
4c658dc523 Haiku: Do not define GLEW_ENABLED to undefine it later 
Partial revert of f61eb5fd8e.
 2016-06-08 00:10:30 +02:00
Juan Linietsky
193272aa8a Merge pull request #5098 from godotengine/revert-5082-EditorFontImportDialog-layout 
Revert "Fix ui layout for EditorFontImportDialog"
 2016-06-07 19:01:56 -03:00
Juan Linietsky
e6ac3a3f35 Revert "Fix ui layout for EditorFontImportDialog" 2016-06-07 19:01:32 -03:00
Rémi Verschelde
c2de978bac Merge pull request #5082 from Geequlim/EditorFontImportDialog-layout 
Fix ui layout for EditorFontImportDialog
 2016-06-07 23:44:01 +02:00
DimOkGamer
9c762fef0f rtr instead ttr 2016-06-07 23:24:32 +03:00
Pawel Kowal
101e0c9ec6 Improved Blender/Collada shadeless->unshaded import 2016-06-07 22:07:48 +02:00
DimOkGamer
ceae11ee29 Fixed localization in file dialogs 
and two more lines.
2 fixes in ru.po.
 2016-06-07 22:48:16 +03:00
Bojidar Marinov
e4a24812cd
Update asset library editor plugin - new functionality and fixes 2016-06-07 21:49:19 +03:00
Rémi Verschelde
5e01566d01 Merge pull request #5091 from djrm/new_icons 
listener icons
 2016-06-07 20:45:33 +02:00
Daniel J. Ramirez
a4fd9d1662 listener icons 2016-06-07 13:41:05 -05:00