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

1011 commits

Author SHA1 Message Date
Rhody Lugo
388249c386 use the same cache for all branches for appveyor 2017-11-28 03:23:51 -04:00
sersoong
320ee1851f Porting 3.0 filessytem_dock's context menu to 2.1 2017-11-19 11:21:36 +08:00
Rhody Lugo
75925198be fix window position computations on macOS 2017-11-14 08:59:50 -04:00
Rémi Verschelde
ff69d1fff2
Merge pull request #12886 from rraallvv/osx_android_travis_2.1 
travis: caching Android, iOS, macOS (cross-compile) (2.1)
 2017-11-13 21:44:45 +01:00
Rhody Lugo
f09bbfa372 change matrix and enable caching for Android, iOS and macOS (cross-compile) 2017-11-13 15:13:46 -04:00
Rémi Verschelde
aafb06cf9f
Merge pull request #12820 from eska014/2.1-html5-pointer-input 
Backport HTML5 pointer-input patches to 2.1
 2017-11-12 20:28:35 +01:00
Leon Krause
b717d1dc4c Implement HTML5 touch events 
(cherry picked from commit 86f5ac3d74)
 2017-11-10 20:54:58 +01:00
Leon Krause
9b07e32656 Reimplement HTML5 mouse input without GLUT 
Fixes inverted scrolling on Chromium

(cherry picked from commit a99b6b2063)
 2017-11-10 20:51:16 +01:00
Rhody Lugo
fd10b1cf4c unified headers fix 2017-11-09 09:47:28 -04:00
Rémi Verschelde
73e3947493
Merge pull request #12605 from rraallvv/unified_headers_2.1 
add support for Android NDK unified headers (2.1)
 2017-11-06 16:07:02 +01:00
Rhody Lugo
c0647681d8 add support for Android NDK unified headers 2017-11-06 07:52:47 -04:00
volzhs
bc285b2ba4 Prevent to stop music in another background app on iOS 2017-11-06 20:13:36 +09:00
volzhs
50868dfd27 Respect use_lto option for building iPhone template 2017-11-02 17:35:06 +09:00
Matthias Hoelzl
fb236045de Make build scripts Scons 3.0/Python3 compatible 
- Cherry picked #10662 and fixed merge conflicts.
- Manualy merged the change from #11904.
- Did not merge #12236 since I'm not sure whether the issue
  affects Godot 2.1 and I don't have VS2013 to test.
- Did not merge #11843 since it doesn't seem relevant (the
  code is only needed for creating DONORS.md, etc.).
- Did not merge #10727 and #11752 since they seem to be
  already included in #11742.
- The Windows and Linux builds have been tested with Scons 3.0
  using Python 3.
- OSX and iOS should hopefully work but are not tested since
  I don't have a Mac.
- Builds using SCons 2.5 and Python 2 should not be impacted.
 2017-10-24 06:41:32 +02:00
Marcelo Fernandez
5cf2fc3a5f Implemented vsync OS functions for OS X 2017-10-23 12:05:42 -03:00
sersoong
5ed8826dd0 update GKScore init function 2017-10-20 17:44:54 +08: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
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
b641a58951 Merge pull request #11847 from RameshRavone/patch-8 
flatDir support [Android] (2.1)
 2017-10-09 12:34:00 +02:00
Ramesh Ravone
77332861c2
flatDir support [Android] 2017-10-05 09:22:37 +05:30
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
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
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
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
Marcelo Fernandez
b48704c620 Fix x11 exported executables not getting the +x flag 2017-09-16 22:38:32 -03:00
Marcelo
0a1370ed96 Fix possible crash at ~EditorExportPlatformBB10 2017-09-08 21:35:20 -03:00
Rémi Verschelde
a36db90655 BB10: Do not poll devices if export is not configured 
See #7131.
 2017-09-05 15:19:17 +02:00
Marcelo Fernandez
68dd103f1b Added new WASAPI driver for Windows 2017-09-03 17:22:05 -03:00
Pedro J. Estébanez
d6d1c55505 Fix pre-Lollipop (21) Android debug 
Namely, automatically pick debug over Wi-Fi for devices with an older release and debug over USB otherwise.

A message is printed both in editor output window and console (uppercase here) to let the user know about what mechanism is being used and why.

Fixes #10458.
 2017-08-30 20:35:42 +02:00
Pedro J. Estébanez
8d49cdcfeb Fix parsing of Android API level 
And renaming the `Device.release` field to `api_level` for correctness.
 2017-08-30 20:12:35 +02:00
Rémi Verschelde
891f6c9b63 Merge pull request #10530 from RandomShaper/remove-old-android-setting-2.1 
Sanitize Android debug (2.1)
 2017-08-29 00:10:31 +02:00
Rémi Verschelde
9d598833d2 Use HTTPS URL for Godot's website in the headers 2017-08-27 14:11:45 +02:00
Wilson E. Alvarez
48b85347c6 Free memory when Main::setup returns an error 
(cherry picked from commit bd257153dc)
 2017-08-27 13:02:15 +02:00
Fabio Alessandrelli
cc9d701658 Allow building fat binaries with osxcross 
(cherry picked from commit d7f08ead4e)
 2017-08-27 13:00:24 +02:00
Rémi Verschelde
5bcfe43a14 Workaround missing WM_TOUCH on mingw-w64 < 4.0 
Upstream bug report: https://sourceforge.net/p/mingw-w64/bugs/460/

(cherry picked from commit 2ed87f33cf)
 2017-08-27 12:36:55 +02:00
Rémi Verschelde
a6805f37d3 Buildsystem: Prevent building X11/server with GCC 6+ 
This is due to a Godot bug which is now fixed in the master branch, but would require
too much work for a short-lived branch such as 2.1. Building release binaries with GCC 6+
will trigger segfaults due to UB when dereferencing pointers with Object::cast_to.

In theory this check should also be made for Windows cross-compilation with MinGW,
but I am more concerned about Linux distros shipping broken binaries than adventurous
cross-compilers hitting a wall.
 2017-08-27 11:11:35 +02:00
George Marques
40a778a709
WinRT: Remove unneeded include 
Fix #10642
 2017-08-25 19:52:20 -03:00
Pedro J. Estébanez
e42d62ae73 Fix Android remote debug not hitting breakpoints 
A change in `Main`'s API is needed. Please read the comment in the diff for an explanation.
 2017-08-22 17:25:28 +02:00
Pedro J. Estébanez
723e8482c0 Make Android debug over USB the only option 
'Remote debug over ADB' is removed as that will be always the case.

Closes #10458.
 2017-08-22 17:10:59 +02:00
Marcelo Fernandez
e3394fc437 Fix y axis for set_window_position on OS X 2017-08-21 15:36:55 -03:00
Marcelo Fernandez
e0a243385b Fixed issues with borderless windows on Windows 2017-08-20 12:22:14 -03:00