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

4206 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Juan Linietsky
c42651c39e Merge branch 'master' of https://github.com/godotengine/godot 2016-06-06 19:56:34 -03:00
Juan Linietsky
85f4f39279 Added function get_signals_connected_to_this_this() 
should help properly implement #5058
 2016-06-06 19:55:50 -03:00
Juan Linietsky
a1b696aa56 Merge pull request #5067 from Hinsbart/x11_vsync 
x11: fix vsync support
 2016-06-06 19:40:28 -03:00
Andreas Haas
5cd7611a9a x11: fix vsync support 2016-06-07 00:19:01 +02:00
Rémi Verschelde
3ae24865f1 Merge pull request #5074 from djrm/new_icons 
Fixed some icons by the feedback received, also added some missing icons
 2016-06-06 23:51:36 +02:00
Daniel J. Ramirez
bf4d749f10 Fixed some icons given the feedback, also added some missing icons 2016-06-06 16:40:59 -05:00
Rémi Verschelde
31fb0eff62 Merge pull request #5072 from Paulb23/error_tab_index_issue_4997 
Fix error tab index out of size print, issue 4997
 2016-06-06 23:32:27 +02:00
Rémi Verschelde
7fd6977ef9 Merge pull request #5070 from zenvoid/master 
Add missing license information for bundled libraries
 2016-06-06 23:31:55 +02:00
Rémi Verschelde
7dd00d3398 Merge pull request #5065 from RandomShaper/keep-default-build-env 
Keep the default environment variables as set by SCons
 2016-06-06 23:27:08 +02:00
Rémi Verschelde
1ce0ccac29 Merge pull request #5059 from J08nY/directory-support 
Somewhat fixed Directory::get_space_left() return values.
 2016-06-06 23:24:56 +02:00
Paulb23
a0eb297cfc Fix error tab index out of size print, issue 4997 2016-06-06 20:25:19 +01:00
Rémi Verschelde
840c5f9b98 Merge pull request #5071 from SaracenOne/anchor_icon_fix 
Anchor icon fix
 2016-06-06 20:47:35 +02:00
Saracen
3a21f98131 Fixed bottom left and right icon order for anchor editor. 2016-06-06 19:38:49 +01:00
Roberto
c0a8c4f6e4 Add missing license information (ogg/vorbis/opus) 2016-06-06 19:05:36 +02:00
Roberto
18fc2ccbe1 Add missing license information (Theora) 2016-06-06 16:32:37 +02:00
Pedro J. Estébanez
ad0af9d273 Keep the default environment variables as set by SCons 2016-06-06 13:49:28 +02:00
Roberto
f97f8971e3 Add missing license information (WebP) 2016-06-06 12:45:30 +02:00