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

1063 commits

Author SHA1 Message Date
Indah Sylvia
88b6c49e22 Enhanced UWP logo on Export dialog 2017-11-29 19:50:02 +07:00
Rhody Lugo
714e02c0f6 disable caching for targets using helper functions 2017-11-28 16:14:24 -04:00
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
Vasiliy Makarov
d37d9aea8e fix build for osx 2017-08-19 10:47:15 +03:00
Marcelo Fernandez
647c4ae5bf Add closest_power_of_2 func and implement mix_rate/latency on OS X 2017-08-18 12:10:21 -03:00
Marcelo Fernandez
830d7c1af1 Fix get_screen_* funcs returning old values after resolution changes on Windows 2017-08-16 13:13:31 -03:00
Marcelo Fernandez
fe37afa8df Implemented borderless window functions on OS X 2017-08-14 09:53:05 -03:00
bruvzg
8edc3991fd Duplicate error messages to macOS logging system 
(cherry picked from commit 68bf243461)
 2017-08-13 20:29:46 +02:00
bruvzg
5b76a456da Fix warp_mouse_pos on macOS 2017-08-05 00:00:05 +03:00
Rémi Verschelde
e87b6d4c63 Merge pull request #9978 from ISylvox/update-gradle-android-for-2.1 
[2.1] Update Gradle-Android buildtool
 2017-08-04 09:45:21 +02:00
Rémi Verschelde
bba0be7967 Merge pull request #9885 from bruvzg/2.1-win-num-enter-fix 
Fix Numpad Enter key on Windows (2.1)
 2017-07-31 22:59:32 +02:00
Rémi Verschelde
c2fd0e65f7 Merge pull request #9986 from marcelofg55/2.1 
Fix get_screen_* funcs returning old values after resolution changes on OS X
 2017-07-31 14:03:15 +02:00
Rémi Verschelde
3a8550675f X11: Do not force require system OpenSSL to build 2017-07-31 00:14:04 +02:00
Rémi Verschelde
c1f54e1a45 Style: Apply clang-format on all files 
Thus fixing some invalid changes that had still made it to the 2.1 branch.
 2017-07-30 23:00:25 +02:00
Marcelo Fernandez
6eedfe4ecb Fix get_screen_* funcs returning old values after resolution changes on OS X 2017-07-30 16:58:00 -03:00
bruvzg
ad034962f1 Change display scale when moving the window from monitor to monitor 
(cherry picked from commit d18922a56e)
 2017-07-30 21:42:17 +02:00
Rémi Verschelde
437cac9f55 Make MinGW test less verbose on non-Bash shells 
The &> construct seems to be Bash-specific.
Supersedes #9755.

(cherry picked from commit 9f768cb519)
 2017-07-30 21:36:36 +02:00
Pedro J. Estébanez
7459c43750 Remove ANDROID define 
Fixes GDNative build error on Android.

It's also discouraged by Google to rely on it. In case someone needs to check, use ``__ANDROID__`` instead, provided by the very same compiler.

(cherry picked from commit 6ea233434a)
 2017-07-30 21:34:59 +02:00
Marcelo Fernandez
4af2afe5b4 Fix fullscreen on X11 for non-resizable windows 
(cherry picked from commit 11dbca419c)
 2017-07-30 21:09:31 +02:00
ISylvox
f7e4190b19 update gradle-android buildtool for 2.1 2017-07-30 12:08:36 +07:00
Marcelo Fernandez
a6129f0a21 Fix mutex initialisation in OS X Audio Driver 2017-07-28 16:17:46 -03:00
George Marques
ea545859bd Merge pull request #9902 from brenttaylor/msvc-build-tools-fix 
Support MSVC (2015) build tools
 2017-07-28 10:40:54 -03:00
Rémi Verschelde
0838a1c420 Merge pull request #9922 from RandomShaper/fix-android-debug-2.1 
Fix Android debug/run (2.1)
 2017-07-28 11:15:45 +02:00
Rémi Verschelde
93e06fa1a8 Merge pull request #9812 from bruvzg/2.1 
Add macOS main menu (2.1)
 2017-07-28 11:05:22 +02:00
Rémi Verschelde
45566c61e3 Merge pull request #9836 from bruvzg/2.1-resize-fix 
Improved macOS window resizing behaviour (2.1)
 2017-07-28 11:02:21 +02:00
Pedro J. Estébanez
aea12b56bc Fix Android debug/run 
Same as _master_'s 0ae3336a329b1fd14b66bb26707c2461b66e5aa8; namely:
- Prefix all __adb__ commands with device specification to avoid errors when multiple devices connected.
- Include Android release in device data collection.
- Force system user:.
    - Ability to enable/disable.
    - Apply only if OS release >= 17 (when multiuser was introduced.
    - Fix argument passing.
- Rename local variable `port` to `dbg_port` to better match its partner `fs_port`.
- Fix typo in error message.

But adds:
- Get the debug port from the editor settings, where it lives now.

Fixes #8581.
 2017-07-27 18:11:23 +02:00
Brent Taylor
90f853f710 Support MSVC (2015) build tools 2017-07-26 21:45:11 -07:00
bruvzg
673211a692 Fix Numpad Enter key on Windows 2017-07-26 21:39:02 +03:00
bruvzg
c121f8d561 Fix Numpad Enter key on macOS 2017-07-26 16:46:44 +03:00
bruvzg
5c7ba482d0 Improved macOS window resizing behaviour. 
Add redraw call to resize callback.
 2017-07-25 12:11:39 +03:00
Jia Wang
5a5b6dcde0 Workaround to allow pasting unicode characters from X selection. 
Fixes #2491.
Fixes #9787.
 2017-07-25 07:27:27 +08:00
bruvzg
9ea472e810 Fix is_window_fullscreen() and set_window_fullscreen() behaviour after window has entered/left full-screen mode via green zoom button. 
Fix get/set_current_screen & set_window_maximized.
 2017-07-24 22:23:25 +03:00
bruvzg
0cd14e5bac Add macOS main menu 2017-07-24 14:32:07 +03:00
Marcelo Fernandez
077b455b93 Updated OS X audio driver with improvements from 3.0 2017-07-23 13:40:38 -03:00
Marcelo Fernandez
da7b181a39 Fix Right-Click (Ctrl-Click) on OS X 2017-07-22 16:35:07 -03:00
BastiaanOlij
88236c7418 Fix typo in plist export 
(cherry picked from commit e735963182)
 2017-07-14 22:04:09 +02:00
George Marques
55a3e078fa
WinRT: Fix problem with Cert Kit validation 2017-07-12 01:33:42 -03:00
George Marques
92ac3869d3
WinRT: Fix exporting problems 
- Replace spaces with %20, since appx don't like it.
- Use .zip extension for custom package templates.
 2017-06-26 14:51:21 -03:00
Poommetee Ketson
4a0dc529ce BuildSystem: generated files have .gen.ext 2017-06-25 20:31:56 +07:00
George Marques
0a9d482482
WinRT: Add Gamepad vibration support 2017-06-24 13:31:36 -03:00
George Marques
fbb4107ec7
WinRT: Fix Gamepad input 
Fix #9216
 2017-06-24 12:22:58 -03:00
ageazrael
fc27e46af4 Used in the macOS HiDPI options window is too small 
(cherry picked from commit 109ad227d3)
 2017-06-17 16:03:13 -07:00
Andreas Haas
c0747b22c3 X11: Turn warning about not finding cursor theme into verbose output. 
Failing to get the cursor theme should not cause any issues since we're then using the default one anyway.
So I removed the warning and made it a verbose-only print instead, as people tend to mistake it for a real error..
(pretty much like `iCCP: known incorrect sRGB profile` :P)

(cherry picked from commit d6333066fc)
 2017-06-17 11:55:05 +02:00
Rémi Verschelde
c4a0679776 Merge pull request #8948 from RandomShaper/improve-mobile-builds-2.1 
Improve/harmonize mobile builds (2.1)
 2017-06-17 11:51:17 +02:00
George Marques
7174d706aa
Fix MouseWheel position on Windows 2017-06-15 13:18:58 -03:00
George Marques
b2f8a365f2
Fix cherry-picking issues caused by code updates 2017-06-07 12:59:42 -03:00
George Marques
477c770181
Change winrt build to be less dependent on ANGLE 
Now it does not try to build if the solution is not found. This way it's
possible to provide a minimal package with includes and libs and make it
build correctly.

Also remove messages from detect.py since it is ran for every platform
target.
 2017-06-07 12:50:38 -03:00
George Marques
21c4bff64c
Add Windows Universal export to editor 
- Use OPENSSL_ENABLED definition to the whole source to detect it
  anywhere.
- Add WinRT/UWP template files with manifest and default images.
 2017-06-07 11:36:00 -03:00
George Marques
e01fdd8a86
Remove embedded ANGLE headers 
There's now a dependency on external ANGLE code, those are not needed
anymore.
 2017-06-07 11:36:00 -03:00
George Marques
48a06f730f
Implement missing WinRT functions 
- Fix buildsystem for WinRT/UWP platform.
- Add audio driver and joystick mapping for WinRT.
- Enable thread class for WinRT.
- Refactor MSVC compiler architecture detection to methods.py, so it can
  be used by Windows and WinRT.
 2017-06-07 11:36:00 -03:00
Pedro J. Estébanez
499ef55cbc Improve/harmonize mobile builds 2017-05-27 23:26:47 +02:00