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

6325 Commits

Author SHA1 Message Date
Rémi Verschelde d5c6806e16 Travis: Disable Android builds for now 
As we say in French, "Trop, c'est trop !".
Those builds fail 50% of the time due to timeouts, it's pointless to have them until we
find a better solution to install the Android SDK and NDK.

Workaround for #6973.
 2016-11-30 09:21:13 +01:00
Rémi Verschelde 8c6a586b75 Merge pull request #7207 from Valentactive/gles3_shader_headers 
adds gles3 auto generated shader header files to ".gitignore"
 2016-11-30 07:40:48 +01:00
Juan Linietsky 1652f876fd Add missing glsl file and remove generated .h files 2016-11-30 07:36:56 +01:00
Michele Valente 9fa6967c24 adds gles3 auto generated shader header files 
Just added the gles3 shader header files entry to ".gitignore" so we
avoid to accidentally commit also those generated files.
 2016-11-30 00:35:04 +01:00
Rémi Verschelde 440c37fbd9 Revert "Do not emit NOTIFICATION_READY more than once (breaking change)" 
This reverts commit b6eab006db.

This commit broke compatibility in an undesired way, as outlined in
https://github.com/godotengine/godot/issues/3290#issuecomment-263388003
 2016-11-30 00:08:01 +01:00
Juan Linietsky a47c78aed1 Screen space reflection effect 2016-11-29 19:55:12 -03:00
volzhs 36b4b45170 Check keystore field when export Android release apk 2016-11-29 14:07:03 +09:00
Rémi Verschelde ab637bc812 Merge pull request #7201 from volzhs/android-alert 
Add alert window on Android
 2016-11-28 15:32:40 +01:00
Rémi Verschelde 8e4f10a3a1 Merge pull request #7200 from volzhs/fix-anim-scroll 
Fix scroll bar moving in AnimationPlayer editor
 2016-11-28 15:32:27 +01:00
Rémi Verschelde bb1201af1f Merge pull request #7198 from volzhs/fix-color-picker 
Fix color selected with mouse scroll
 2016-11-28 15:32:06 +01:00
Rémi Verschelde e297087cab Merge pull request #7195 from bugstew/texture_region_snap_mode 
Fix snap mode selector sticking in texture region module
 2016-11-28 15:31:42 +01:00
Rémi Verschelde 895b29978b Merge pull request #7184 from volzhs/spinbox 
Prevent Spinbox value update while not focused or disabled
 2016-11-28 15:28:55 +01:00
Rémi Verschelde 2cf4c5e173 Merge pull request #7170 from Ovnuniarchos/TileMapBlendMode 
TileMap now honors blending mode.
 2016-11-28 15:21:35 +01:00
Rémi Verschelde 39fede4b17 Merge pull request #7157 from leezh/buttonarray_fixes 
Flat button support in ButtonArray. Fixes #7153
 2016-11-28 15:20:07 +01:00
Rémi Verschelde 35e754db59 Merge pull request #7138 from bojidar-bg/ready_guard 
Do not enter _ready twice
 2016-11-28 15:19:50 +01:00
Rémi Verschelde f28ff8a208 Fix console output for MinGW compilers 
Reworked patch from @jay3d (#7116).
 2016-11-28 15:12:54 +01:00
volzhs 9a20068ab7 Add alert window on Android 2016-11-28 10:20:57 +09:00
volzhs babc5048dd Fix scroll bar moving in AnimationPlayer editor 
Fix #7196
 2016-11-28 02:41:47 +09:00
volzhs d9048309e4 Fix color selected with mouse scroll 
Fix #7192
 2016-11-28 01:58:01 +09:00
Dmitry Kram d766738991 Fix snap mode selector sticking in texture region module 
When changing snap mode in texture region plugin ticks was not updating. Issue fixed changing order of setting checked status and setting snap mode.
 2016-11-27 02:56:42 +02:00
Juan Linietsky 3f40701002 fixed bug removing dependencies 2016-11-24 23:30:54 -03:00
Juan Linietsky a732708b9d Blend shapes using transform feedback (GPU) 2016-11-24 20:46:55 -03:00
Ovnuniarchos e07dd9ab32 TileMap now honors blending mode. 2016-11-24 21:28:10 +01:00
volzhs 4df33cbcb3 Prevent Spinbox value update while not focused or disabled 2016-11-25 03:15:42 +09:00
Rémi Verschelde cefb2de339 Merge pull request #7181 from BastiaanOlij/macosx-version-min 
Set minimum version to 10.9 building OSX
 2016-11-24 16:06:06 +01:00
BastiaanOlij da5651fbb9 Set minimum version to 10.9 building OSX 2016-11-25 00:55:13 +11:00
Juan Linietsky 69c30709ec implemented immediates 2016-11-23 08:00:15 -03:00
Juan Linietsky 7cf8d75cf8 WIP immediates and proper buffers swapping 2016-11-23 07:04:55 -03:00
Rémi Verschelde f18470c199 Revert "X11: Fix maximized boot splash" 
This reverts commit 8d3efe2b7d.
It introduced crashes for some users when trying to capture
the XConfigureNotify event.
 2016-11-23 07:53:31 +01:00
Juan Linietsky b72ca04605 Changed to proper GLSL version 2016-11-22 20:53:37 -03:00
Juan Linietsky 9d635f0629 Migrated from GLES to GLAD, fixes many issues. 2016-11-22 20:51:56 -03:00
George Marques a692b7a1c1 Merge pull request #7149 from Kazuo256/array-last 
Add Array.front() and Array.back()
 2016-11-22 08:08:59 -02:00
Rémi Verschelde 830ab4ea8d Merge pull request #7172 from Faless/fix_localize_path 
Properly localize absolute path that starts with the resource folder.
 2016-11-22 10:16:41 +01:00
Fabio Alessandrelli cdc97ca453 Properly localize absolute path. 
Calling localize_path will return a localized path in res:// if the
path starts with the resource file-system/folder, and will return
the unchanged absolute path otherwise.

Closes #6979 and #7161.
 2016-11-22 09:09:39 +01:00
Juan Linietsky 943d27f46d Instancing is working! (hooray) 2016-11-22 01:26:56 -03:00
Juan Linietsky 70d095d8f2 Skeletons are working now. 2016-11-21 19:03:39 -03:00
Rémi Verschelde 9e2d09f580 Merge pull request #7145 from avril-gh/fixes-6464-lost-icons 
fixes #6464 lost icons in dock and file dialog, also #6443 , #6302
 2016-11-21 12:01:23 +01:00
romeojulietthotel f8d523b68b Correct description for the return values from get_status. (#7137) 2016-11-21 11:55:57 +01:00
Rémi Verschelde d5a9102a88 Merge pull request #7125 from Hinsbart/x11_maximize 
X11: Fix maximized boot splash
 2016-11-21 11:54:49 +01:00
Rémi Verschelde e3c09ed90d Merge pull request #7124 from volzhs/select_match 
Select exactly matched file automatically in FileDialog
 2016-11-21 11:54:33 +01:00
Rémi Verschelde 9df47f2c69 Merge pull request #7123 from zaps166/webm_iphone_x86 
WebM: Fix iPhone x86 compilation
 2016-11-21 11:54:12 +01:00
Rémi Verschelde 6b2db2f1b6 Merge pull request #7122 from zaps166/webm_msvc2013 
Fix compilation with MSVC 2013
 2016-11-21 11:53:32 +01:00
Juan Linietsky a2505542ff Huge amount of improvement in the material system. Materials should be 
a lot more complete and usable now.
 2016-11-20 22:49:53 -03:00
Juan Linietsky c39d2b3f42 working reflection probes!! 2016-11-19 13:23:37 -03:00
Zher Huei Lee 191fdc873e Reused Button styleboxes for ButtonArray 
Plus other tweaks to make it look more similar to a VBoxContainer of
Buttons.
 2016-11-19 22:07:12 +08:00
Zher Huei Lee 4b7443aeea Flat button support in ButtonArray. Fixes #7153 2016-11-19 21:48:39 +08:00
Rémi Verschelde 4965ddfaa1 png: Allow building shared freetype with bundled libpng 
This was the behaviour when building Godot 2.1, which allows to build against
Ubuntu 12.04 and its freetype that links old libpng12, while still bundling
libpng16.
 2016-11-19 14:09:01 +01:00
Rémi Verschelde c32766a482 Revert "libpng: Fix erroneously linking against libpng12 on old distros" 
This reverts commits 5fa1bb331a
and ec4be71fad.

Looks like Debian/Ubuntu are not even shipping libpng16 nowadays in their
stable releases, we'll have to go back to statically linking our own
libpng16 to wait for them to stop being 5 years behind everybody.
 2016-11-19 13:39:03 +01:00
Rémi Verschelde ec4be71fad libpng: Same fix as previous commit for server platform 2016-11-19 13:25:17 +01:00
Rémi Verschelde 5fa1bb331a libpng: Fix erroneously linking against libpng12 on old distros 
This bit us for 2.1.1 binaries built on Ubuntu 12.04 LTS where
libpng.pc apparently prioritizes libpng12.
 2016-11-19 12:59:48 +01:00