Commit Graph

918 Commits

Author SHA1 Message Date
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
Rémi Verschelde 1b99d75d7e Merge pull request #8934 from volzhs/get-locale
Make OS.get_locale() returns same value
2017-05-27 11:27:14 +02:00
Rémi Verschelde 441196a52c Merge pull request #8940 from RandomShaper/ccflags-iphone-2.1
Allow custom CCFLAGS for iPhone builds (2.1)
2017-05-27 00:48:59 +02:00
sanikoyes b8ae40de72 Fixed audio can not resume if it is interrupted cause by an incoming phone call
(cherry picked from commit 7d374b5974)
2017-05-27 00:42:59 +02:00
Rémi Verschelde d432ad1e17 Improve documentation of thirdparty code snippets
(cherry picked from commit c8aea60324)
2017-05-26 23:53:14 +02:00
Pedro J. Estébanez f6c50a6289 Allow custom CCFLAGS for iPhone builds
and disable exceptions by default
2017-05-26 22:35:09 +02:00
volzhs a495feae3e Make OS.get_locale() returns same value 2017-05-27 03:42:28 +09:00
Ramesh Ravone 22c174bb71 Android: avoiding duplicates in build.gradle
(cherry picked from commit f8309f86c2)
2017-05-26 18:08:59 +02:00
Ramesh Ravone 9028a75452 Android: Support to change minSdkVersion (#8313)
(cherry picked from commit 93b417fe17)
2017-05-26 18:08:26 +02:00
Rémi Verschelde 99f65fcb4f Merge pull request #8922 from volzhs/fix-android-build
Fix android build regression by 69c4c4a
2017-05-26 16:00:50 +02:00
volzhs c6ebb6a40c Fix android build regression by 69c4c4a 2017-05-26 20:42:36 +09:00
Rémi Verschelde 29c7118f32 Merge pull request #8913 from RandomShaper/ios-alert-2.1
Implement OS.alert() for iOS (2.1)
2017-05-26 07:56:24 +02:00
Pedro J. Estébanez b870ff6940 Implement OS.alert() for iOS 2017-05-25 17:30:36 +02:00
volzhs d4ef6216d3 Fix android payment logical error
getting sku detail runs only if mod != 0 which means querying 20*n will not get sku details.
referenced from https://github.com/googlesamples/android-play-billing/blob/master/TrivialDrive/app/src/main/java/com/example/android/trivialdrivesample/util/IabHelper.java#L1029-L1062
2017-05-19 12:11:59 +09:00
Pedro J. Estébanez deda04faff Upgrade Android build tools to the latest 2017-05-16 00:54:54 +02:00
Rémi Verschelde aa046a85dc Merge pull request #8740 from pixelpicosean/scrollingWithFactor
Implemented scrolling factor for precision trackpads for 2.1
2017-05-15 07:57:05 +02:00
Sean Bohan ee670f3724 Implemented scrolling factor for smooth trackpad scrolling
Working platforms platform: OSX, Windows.
Support for almost all ui elements, including project list.

Ported from 304a1f5b5a (#7864).
Fixes #492 and #3913.
2017-05-15 06:44:00 +08:00
Fabio Alessandrelli aa167fa04b Rename debug/debug_port to network/debug_port.
Expose it in editor settings.
2017-05-12 20:01:53 +02:00
Fabio Alessandrelli e9a7eeaf9c Fix UDP wait() not returning after first received packet
(cherry picked from commit 5c6715a291)
2017-05-12 20:01:53 +02:00
Fabio Alessandrelli bd26eacc59 Allow non blocking UDP put_packet in C++.
- Add blocking mode option to PacketPeerUDP.
- put_packet returns ERR_UNAVAILABLE when operation would block.
- ENet module uses non-blocking UDP.

(cherry picked from commit 5f681d0b0f)
2017-05-12 20:01:53 +02:00
Rémi Verschelde 05d83a62c6 Merge pull request #8695 from BastiaanOlij/mfi_support_2.1
iPhone MFI gamepad support
2017-05-12 18:16:41 +02:00
Rémi Verschelde 353ed88a54 Merge pull request #8724 from volzhs/android-jni
Fix compile error when use "android_add_jni_dir"
2017-05-12 08:24:32 +02:00
Rémi Verschelde 229c277585 Merge pull request #8722 from volzhs/fix-android
Fix possible memory leak for Android and update gradle
2017-05-12 08:24:09 +02:00
volzhs 69c4c4a20c Fix compile error when use "android_add_jni_dir" 2017-05-12 15:07:41 +09:00
volzhs c7d3aac505 Update to latest gradle 2017-05-12 14:38:23 +09:00
volzhs a6c74136b5 Fix possible memory leak for Android
/godot_dev/platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java:575: Error: The WIFI_SERVICE must be looked up on the Application context or memory will leak on devices < Android N. Try changing  to .getApplicationContext()  [WifiManagerLeak]
            mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

   Explanation for issues of type "WifiManagerLeak":
   On versions prior to Android N (24), initializing the WifiManager via
   Context#getSystemService can cause a memory leak if the context is not the
   application context. Change context.getSystemService(...) to
   context.getApplicationContext().getSystemService(...).

1 errors, 0 warnings
2017-05-12 14:38:15 +09:00
BastiaanOlij de9efc2fdf iPhone MFI gamepad support 2017-05-09 08:57:17 +10:00
Rémi Verschelde e3cf067845 X11: Abort build if using OpenSSL 1.1.0+
Workaround until #8624 is fixed.

(cherry picked from commit 2976801012)
2017-05-06 19:01:33 +02:00
volzhs 7919ce782b Fix error or download again if use obb for Android 2017-04-26 03:43:38 +09:00
Rémi Verschelde ef351971d8 Drop EXEC PATHP?? super verbose info message
It seems to give nightmares to Windows users.

(cherry picked from commit dd55950b62)
2017-04-20 01:55:54 +02:00
Rémi Verschelde a27876d5ac Style: Apply clang-format (3.9.1) to Obj-C++ files 2017-04-09 14:03:52 +02:00
Rémi Verschelde 4b561e3e04 Merge pull request #8311 from BastiaanOlij/format_mm_2.1
Spaces to tabs and layout adjustments on .mm files
2017-04-08 16:49:51 +02:00
Rémi Verschelde 7f32db5ac9 Revert "8145 - Mouse Position is unknown until first mouse event on X11 & Win"
This reverts commit e5d63aaece.
Same reasoning as #8291.
2017-04-08 11:28:25 +02:00
BastiaanOlij 33ea9fc4a7 Spaces to tabs and layout adjustments on .mm files 2017-04-08 09:47:13 +10:00
Rémi Verschelde 2491754de7 Style: Fix some badly formatted files 2017-04-08 01:42:41 +02:00
Rémi Verschelde e9b045d9e5 Add "Godot Engine contributors" copyright line 2017-04-08 00:45:24 +02:00
Rémi Verschelde f71da5c8c5 Merge pull request #8273 from RandomShaper/fix-android-x86-2.1
Fix crash on Android-x86 (2.1)
2017-04-05 22:27:58 +02:00
Pedro J. Estébanez 212fca0c50 Fix crash on Android-x86 2017-04-05 22:16:04 +02:00
Sergey Pusnei e5d63aaece 8145 - Mouse Position is unknown until first mouse event on X11 & Win
- X11 update input->pos on EnterNotify
- X11 & Win call first-time events processing before main initialization

(cherry picked from commit c79e998d1f)
2017-04-05 08:08:08 +02:00
Ramesh Ravone 1c17e5b38d Update build.gradle.template
Updating project repository,
added jcenter() since Android Studio uses it by default.

https://www.jfrog.com/knowledge-base/why-should-i-use-jcenter-over-maven-central/
(cherry picked from commit 77c81a21d8)
2017-04-05 08:07:01 +02:00
Rémi Verschelde b3d1113ae3 Merge pull request #8152 from Hinsbart/input_id_2.1
[2.1] Better handling of joypad device IDs.
2017-03-27 08:51:15 +02:00
Andreas Haas 8c06da0d49
Better handling of joypad device IDs.
Now InputDefault is responsible for giving out joypad device IDs to the platform, instead of each platform handling this itself.
This makes it possible for c++ modules to add their own "custom" gamepad devices, without the risk of messing up events in case the user also has regular gamepads attached (using the OS code).
For now, it's implemented for the main desktop platforms.
Possible targets for future work: android, uwp, javascript
2017-03-26 00:12:11 +01:00
Rémi Verschelde 31107daa1a SCons: Add option to toggle warnings (on by default)
All the warnings are factored out of the platform-specific files and moved to
SConstruct. Will have to check that it does not introduce regressions on some
platforms/compilers.
2017-03-25 09:24:29 +01:00
Rémi Verschelde 492f6e06c0 Merge pull request #8088 from BastiaanOlij/android_gravity_2.1
Android gravity vector Godot 2.1
2017-03-24 22:49:23 +01:00
Rémi Verschelde fd17d301d0 Merge pull request #8100 from BastiaanOlij/ios_magnetometer_2.1
Fixing magnetometer on iOS
2017-03-23 09:57:29 +01:00
Fabio Alessandrelli 15ecdb5f00 Fix buffer size check in UDP socket.
We were reserving 12 bytes from the buffer for ip, port, and length, but since
IPv6 introduction we should be reserving 24 (IPv6 are 16 bytes)

(cherry picked from commit 5dc7c920bf)
2017-03-22 21:11:49 +01:00