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

4224 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Paulb23 d66b034bd1 Improved breakpoint marker position, and scales with font size 2016-06-07 16:59:16 +01:00
Juan Linietsky ce328ce99b Merge pull request #5084 from J08nY/issue-5051 
Windows: Hide mouse on MOUSE_MODE_CAPTURED
 2016-06-07 11:02:20 -03:00
Juan Linietsky 4b893ffeeb Merge pull request #4861 from brakhane/negative-indexing 
Add support for Python-like negative indexing
 2016-06-07 10:17:00 -03:00
Rémi Verschelde a21eb2b89d Merge pull request #5057 from pkowal1982/master 
Improved Blender/Collada -colonly import creating collision shapes fo…
 2016-06-07 13:22:00 +02:00
J08nY 3cfa920982
Windows: Hide mouse on MOUSE_MODE_CAPTURED 
Fixes #5051
 2016-06-07 12:57:01 +02:00
Rémi Verschelde bf98095f46 Merge pull request #5083 from J08nY/classref 
Added classref for Image, ImageTexture, LargeTexture
 2016-06-07 12:23:12 +02:00
J08nY ec96e36bc9
Classref for: ImageTexture, Image, LargeTexture 2016-06-07 12:17:18 +02:00
J08nY 8a4eca8aa8
Exposed Image.INTERPOLATE_* 2016-06-07 11:46:07 +02:00
J08nY db5ea849d8
Sync classref 2016-06-07 10:39:36 +02:00
Geequlim a1ba404cc5 Fix ui layout for EditorFontImportDialog 2016-06-07 16:13:53 +08:00
Rémi Verschelde aed5474238 Merge pull request #4729 from volzhs/android-23 
Supporting Android API 23 (Android 6.0)
 2016-06-07 09:45:24 +02:00
Rémi Verschelde 0729c852b4 Fix indentation issues in last commits 
Ping @reduz.
 2016-06-07 07:39:40 +02:00
punto- 78218359b1 Merge pull request #5078 from godotengine/revert-5054-fix-implicit-extends 
Revert "Fix implicit GDScript Reference inheritance"
 2016-06-06 21:19:10 -07:00
punto- 86253cbdfe Revert "Fix implicit GDScript Reference inheritance" 2016-06-06 23:40:50 -03:00
Juan Linietsky 0c985913a7 Merge pull request #4092 from sanikoyes/Pr-etc1-pkm-loading 
Add etc1(pkm) texture loading support
 2016-06-06 22:14:11 -03:00
Juan Linietsky 06bc4e20d3 Merge pull request #4101 from SaracenOne/listener 
Added New Listener Spatial Node.
 2016-06-06 22:13:23 -03:00
Juan Linietsky aec5506414 properly pass events to parent controls, closes #4701 2016-06-06 22:03:29 -03:00
Juan Linietsky e535c942f3 Merge branch 'master' of https://github.com/godotengine/godot 2016-06-06 21:15:13 -03:00
Juan Linietsky 2b9cab25c0 -Fix small bug regarding to canvas layer detection, closes #4381 2016-06-06 21:14:25 -03:00
Juan Linietsky c86f1f1737 Merge pull request #4693 from kjohnson0451/dvector_invert 
Adds invert() method DVector
 2016-06-06 20:54:39 -03:00
Juan Linietsky 9a3ca0eaa2 Merge pull request #4824 from 29jm/pr-3481 
Ability to rename autoloads
 2016-06-06 20:46:10 -03:00
Juan Linietsky 82b759d938 Merge pull request #4895 from TheoXD/_fix_interactive_loader_cache 
fixed interactive_loader() not returning a cached scene
 2016-06-06 20:35:54 -03:00
Juan Linietsky 736b65e566 Merge pull request #4977 from SaracenOne/scripting_expose 
Expose extra methods and constants to scripts
 2016-06-06 20:27:40 -03:00
Juan Linietsky be830d10c2 Merge pull request #5026 from Geequlim/patch9frame-extension 
Enhanced Patch9Frame
 2016-06-06 20:15:33 -03:00
Juan Linietsky 7499fa4507 Merge pull request #5048 from J08nY/dictionary 
Added Dictionary.values()
 2016-06-06 20:09:04 -03:00
Juan Linietsky 5aa4070438 Merge pull request #5054 from eska014/fix-implicit-extends 
Fix implicit GDScript Reference inheritance
 2016-06-06 20:08:39 -03:00
Juan Linietsky 9df4c18853 Merge pull request #5056 from SaracenOne/bitmask_import_plugin 
Bitmask import plugin
 2016-06-06 20:07:30 -03:00