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

6460 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Indah Sylvia
f50a0cecd9 Fixed typo: 'texure' to 'texture' 2017-09-29 04:30:06 +07:00
Indah Sylvia
d921ae21ef Added 'Godot Contributors' in project manager title 2017-09-29 03:21:14 +07:00
Rémi Verschelde
7213e67f6a Merge pull request #11476 from marcelofg55/export_dmg_21 
Ported BastiaanOlij code from master to export to .dmg on OS X, with some improvements
 2017-09-26 08:20:28 +02:00
Rémi Verschelde
3ec45a60b1 Dist: Use HTTPS for screenshot link in AppData file 
[ci skip]

(cherry picked from commit b57fa8f19b)
 2017-09-24 19:42:00 +02:00
Rémi Verschelde
cba8052259 doc: Clarify doc of StreamPlayer.get_stream_name() 
Closes #6196.
[ci skip]
 2017-09-24 13:51:38 +02:00
Rémi Verschelde
e25c37afa1 Dist: Add man page for Linux packagers 
[ci skip]
 2017-09-24 12:39:45 +02:00
Rémi Verschelde
514c8ab66c main: Cosmetic changes to help output 
It still uses the old-style switches with only one dash for long arguments,
contrarily to the better help output of the master branch, but it is not worth
doing such big changes in the stable branch at this time.
 2017-09-24 12:39:02 +02:00
Rémi Verschelde
893ebc54fc Dist: Add desktop and AppStream files for Linux packagers 
[ci skip]

(cherry picked from commit 20c8a4752c)
 2017-09-24 10:10:58 +02:00
Elliott Sales de Andrade
8d246dfc1d Add support for OpenSSL 1.1.0. 
This release hides many struct members which provides easier forward
compatibility but is a break from previous releases. A few small macros
provide compatibility between both 1.1.0 and 1.0.x.

Fixes #8624.

(cherry picked from commit 00c03bdd2b)
 2017-09-24 09:19:28 +02:00
Marcelo Fernandez
d706ee6f0a Ported BastiaanOlij code from master to export to .dmg on OS X, with some improvements 2017-09-21 17:47:50 -03:00
Marcelo Fernandez
b0d5596738 Added OS::move_path_to_trash function, implemented only on OS X for now. 2017-09-21 17:45:32 -03:00
Marcelo Fernandez
253db95cba OS::execute can now read from stderr too when executing with a pipe. 2017-09-21 17:44:53 -03:00
Rémi Verschelde
1391269a78 Merge pull request #10124 from marcelofg55/handle_sigsegv 
Added a SIGSEGV handler that dumps the stacktrace to ease reporting
 2017-09-21 11:30:40 +02:00
Rémi Verschelde
af019d397c Merge pull request #11449 from volzhs/fix-trustmanager 
Fix TrustManager for Android
 2017-09-21 10:22:24 +02:00
volzhs
24f2864e78 Fix TrustManager for Android 2017-09-21 06:23:40 +09:00
Rémi Verschelde
d344fb6089 Merge pull request #11427 from marcelofg55/fix_chmod_return 
Fix base _chmod return value

[ci skip]
 2017-09-20 09:29:49 +02:00
Marcelo Fernandez
ad37dbfec2 Fix base _chmod return value 2017-09-19 20:38:59 -03:00
Marcelo Fernandez
60cf34b968 Added a crash handler to dump the backtrace on Windows, Linux and OS X 2017-09-19 19:56:24 -03:00
Poommetee Ketson
41ad28f58f Merge pull request #11408 from sersoong/2.1 
Fix editor/property_editor.cpp TTR
 2017-09-19 11:56:57 +07:00
sersoong
ded734a678 Fix editor/property_editor.cpp TTR 2017-09-19 12:22:41 +08:00
Rémi Verschelde
ccf7e17da4 Merge pull request #11342 from marcelofg55/2.1 
Fix x11 exported executables not getting the +x flag
 2017-09-17 22:41:30 +02:00
Marcelo Fernandez
b48704c620 Fix x11 exported executables not getting the +x flag 2017-09-16 22:38:32 -03:00