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

6430 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde e3a1bf247d Document -export_debug option in the help output 
Fixes #5903.
 2017-10-19 23:49:49 +02:00
Rémi Verschelde edd9e35b2d Merge pull request #12197 from rcurtis/2.1_issue12189 
Index p_index out of size and connect: Condition ' s->slot_map.has(target) ' is true

[ci skip]
 2017-10-18 11:23:00 +02:00
RCurtis 5fe2ce8199 Fixed duplicate signal connection 2017-10-17 18:34:50 -04:00
Rémi Verschelde aeb313541d Merge pull request #12102 from RandomShaper/fix-seek-to-end-2.1 
Fix animation not stopping after seeking to the end (2.1)
 2017-10-15 20:16:50 +02:00
Pedro J. Estébanez a0a9363b7a Fix animation not stopping after seeking to the end 
Fixes #10228.

(cherry picked from commit 2d2467c0ff)
 2017-10-14 22:23:52 +02:00
Rémi Verschelde 7644f337e0 Merge pull request #12098 from RandomShaper/fix-scons3-android-build-2.1 
Fix Android build error with SCons 3.0 (2.1)

[ci skip]
 2017-10-14 21:16:14 +02:00
Pedro J. Estébanez f50e5dc594 Fix Android build error with SCons 3.0 
Not sure why this happens without having upgraded Python itself, but is needed now.

Not needed for _master_ because there we have b6e1e47e3a that does this and more.

This commit does not address upgrading to Python 3.0. It just makes building for Android work again after upgrading SCons while keeping Python 2.7.
 2017-10-14 20:53:00 +02:00
Rémi Verschelde 6f4ddad5d1 Merge pull request #12086 from ISylvox/vk-to-keycode-2.1 
[2.1] Fix wrong Virtual-KeyCode(0x12) pair on Windows platform
 2017-10-14 20:12:22 +02:00
Indah Sylvia 06dd291865 Fixed wrong Virtual-KeyCode(0x12) pair on Windows platform (#12073) 2017-10-14 15:49:21 +07:00
Rémi Verschelde fd8a71397d Merge pull request #11796 from RameshRavone/back_event 
Handling BackPress event [Android]
 2017-10-12 20:12:00 +02:00
Rémi Verschelde c325ae5386 Merge pull request #12050 from ISylvox/libpng-1.6.33_-_2.1 
[2.1] Update LibPNG to v1.6.33
 2017-10-12 13:03:44 +02:00
Indah Sylvia bda3683b05 updated libpng to version 1.6.33 (September 28, 2017) 2017-10-12 14:34:42 +07:00
Rémi Verschelde 8122d943c4 Merge pull request #12040 from Shin-NiL/2.1 
Allows to export PCK/ZIP without templates
 2017-10-11 23:02:31 +02:00
Rémi Verschelde 7b5310753e Merge pull request #11977 from DmitryKrutskikh/filter-input-events-in-project-manager 
Skip unhandled input events on asset library tab. (2.1)

[ci skip]
 2017-10-11 22:31:53 +02:00
Rémi Verschelde b1ea083b3f Merge pull request #11863 from marcelofg55/conv_scripts_exp 
Added an experimental convert scripts option for godot3 export
 2017-10-11 22:21:46 +02:00
Rémi Verschelde 830d6346f1 Merge pull request #11742 from Listwon/vsproj 
Update VS project generation
 2017-10-11 22:17:28 +02:00
Dmitry Krutskikh fa08388c29 Skip unhandled input events on asset library tab. 2017-10-11 22:46:36 +03:00
Shin-NiL 5f0067a7ee Allows to export PCK/ZIP without templates 2017-10-11 15:25:02 -03:00
Andreas Haas 467dddf555 Merge pull request #12021 from Shin-NiL/2.1 
Won't change editor tabs when using External Editor.
 2017-10-11 15:34:51 +02:00
Shin-NiL d1c5272308 Won't change editor tabs when using External Editor. 2017-10-11 09:03:44 -03:00
Andreas Haas 552f71cad8 Merge pull request #11970 from volzhs/freetype-2.8.1-2.1.x 
Update freetype to 2.8.1
 2017-10-10 20:47:57 +02:00
Andreas Haas 2235f6266a Merge pull request #11968 from Faless/ipv6_no_linklocal_2.1 
[2.1] Do not allow link-local addresses to be used by editor debugger
 2017-10-10 20:40:45 +02:00
Marcelo Fernandez cecc893702 Added an experimental convert scripts option for godot3 export 2017-10-09 14:36:11 -03:00
volzhs 438175dd2b Update freetype to 2.8.1 2017-10-10 01:38:41 +09:00
Fabio Alessandrelli 0a34d35218 Do not allow link-local addresses to be used by editor debugger 
Default editor debugger address is now 127.0.0.1

(cherry picked from commit 72b4a09a14)
 2017-10-09 16:07:13 +02:00
Rémi Verschelde 8a57fe819d Merge pull request #11932 from DmitryKrutskikh/correct-project-icon-align 
Fix project icon align (2.1).
 2017-10-09 15:14:03 +02:00
Rémi Verschelde 5ac1348523 Merge pull request #11911 from Paulb23/line_edit_caret_resetting_2_1 
Fixed caret settings resetting (2.1)
 2017-10-09 14:52:44 +02:00
Rémi Verschelde ea3c476dcd Merge pull request #11909 from Paulb23/members_overview_2_1 
Added members overview (2.1)
 2017-10-09 14:52:32 +02:00
Rémi Verschelde b641a58951 Merge pull request #11847 from RameshRavone/patch-8 
flatDir support [Android] (2.1)
 2017-10-09 12:34:00 +02:00
Rémi Verschelde 87afd1800b Merge pull request #11781 from marcelofg55/iphone_crashfix 
Fix possible crash at exit on iOS
 2017-10-09 12:02:43 +02:00
Bartłomiej T. Listwon c871f50c55 Fix Intellisense 
Fix the CPPPATH passed to MSVSProject. Uses SCons Dir() function to convert "#" paths http://www.scons.org/doc/0.97/HTML/scons-user/a3414.html#CV-CPPPATH
 2017-10-09 12:01:41 +02:00
Bartłomiej T. Listwon 4d1a55be2f Update VS project generation 
Update VS project generation and add num_jobs option (default value: 2 - the same as before) for parallel builds inside Visual Studio. Tested with SCons 3.0 and Visual Studio 2017.
 2017-10-09 12:00:46 +02:00
Dmitry Krutskikh e6b7e055a0 Fix project icon align. 
Now icon vertically centered
 2017-10-08 19:59:37 +03:00
Paulb23 dcaa7ba2b8 Fixed carret settings resetting (2.1) 2017-10-07 14:54:10 +01:00
Paulb23 8cc56c16cf Added members overview (2.1) 2017-10-07 14:41:46 +01:00
Andreas Haas 1a934a58e4 Merge pull request #11870 from marcelofg55/main_scene_export 
Fix godot3 exporter main_scene conversion
 2017-10-06 19:59:57 +02:00
Andreas Haas fdc7bef9ac Merge pull request #11883 from marcelofg55/conv_filter_mipmaps 
Convert filter/gen_mipmaps on godot3 exporter
 2017-10-06 19:57:59 +02:00
Marcelo Fernandez 1f411d7e22 Convert filter/gen_mipmaps on godot3 exporter 2017-10-06 12:04:52 -03:00
Rémi Verschelde c7f7ac3a10 Merge pull request #11869 from marcelofg55/conv_fonts 
Godot3 Exporter now converts .fnt to .font

[ci skip]
 2017-10-06 15:14:04 +02:00
Marcelo Fernandez 6747c2b3e8 Fix godot3 exporter main_scene conversion 2017-10-06 10:03:06 -03:00
Andreas Haas fac56895d0 Merge pull request #11809 from Listwon/NavigationMesh 
Fix LINK/UNLINK console spam with navmeshes
 2017-10-06 13:18:11 +02:00
Marcelo Fernandez 2f49e553f0 Godot3 Exporter now converts .fnt to .font 2017-10-05 22:50:43 -03:00
Ramesh Ravone 77332861c2
flatDir support [Android] 2017-10-05 09:22:37 +05:30
Bartłomiej T. Listwon 956327d972 Fix LINK/UNLINK console spam with navmeshes 
Removed unnecessary debug messages. Fixes #10804
 2017-10-03 19:54:55 +02:00
Ramesh Ravone 2ba23c8ae7
Handling BackPress event [Android] 2017-10-03 11:33:37 +05:30
Marcelo Fernandez 116e735e8b Fix possible crash at exit on iOS 2017-10-02 23:20:06 -03:00
Poommetee Ketson 0f9e1b5f0c Merge pull request #11705 from Hinsbart/appveyor-2.1 
Fix AppVeyor failing on 2.1
 2017-10-02 23:35:21 +07:00
Andreas Haas 9a793659dd Merge pull request #11680 from ISylvox/added-contributor 
[2.1] Add 'Godot Contributors' in Project Manager Title
 2017-09-30 17:28:14 +02:00
Andreas Haas 36f673f788
Add .appveyor.yml 2017-09-29 19:32:21 +02:00
Gilles Roudiere 2b06237235 Merge pull request #11682 from ISylvox/texure-to-texture-2.1 
[2.1] Fix Typo: 'Texure' to 'Texture'
 2017-09-29 11:40:24 +02:00