Commit Graph

755 Commits

Author SHA1 Message Date
Rémi Verschelde d81b635957 Merge pull request #5495 from SuperUserNameMan/joystick_bug_windows
fixes #5464 windows_joystick close_joystick bug
2016-06-30 08:07:59 +02:00
Rémi Verschelde 91655b9a18 Merge pull request #5494 from jay3d/master
Fixed building for latest Haiku nightlies.
2016-06-30 08:07:24 +02:00
SuperUserNameMan 2511f48339 fixes #5464 windows_joystick close_joystick bug 2016-06-29 23:00:45 +02:00
Jamil Halabi fbdb717cae Fixed building for latest Haiku nightlies. 2016-06-29 15:40:25 -04:00
volzhs aac0af043c Fix wrong return bool, string, string array data through jni 2016-06-30 01:23:55 +09:00
Pedro J. Estébanez e7b2626707 Make Android build smarter (SCons + Gradle)
Upgrade Gradle and Android plugin for Gradle
Disable all signing and zip-aligning for the export templates
Give correct names to generated APKs
Put .so files built by SCons right where Gradle has to pick them according to arch & build type
Downgrade NDK platform to 14 to match minSdkVersion
2016-06-27 10:49:15 +02:00
Ferdinand Thiessen 9e751178eb Fix compiling for X11 on non-86, this fixes #5444 2016-06-27 03:03:42 +02:00
George Marques bf44275b1a
Fix visual server error when minimizing the window 2016-06-26 18:54:34 -03:00
Rémi Verschelde 7d06d50e65 Merge pull request #5395 from vnen/android-sensors
Fix Android sensors polling rate on resume
2016-06-26 09:46:10 +02:00
Rémi Verschelde fad6b29a59 Merge pull request #5390 from volzhs/jni-stringarray
Fix string array parameter check with jni
2016-06-26 09:45:36 +02:00
Juan Linietsky 8dac3bf3b1 Added function to notify ScriptLanguage when a thread is created/freed, allows scripts to allocate a stack there via TLS 2016-06-25 10:41:23 -03:00
Rémi Verschelde c931ed976b Gradle: remove trailing spaces 2016-06-25 13:39:03 +02:00
paper-pauper dd1ad31757 Changes X11 res_name to "Godot_Engine"
Add additional/alternative WM_CLASS; only affects the game window, avoids redundancy and allows finer control in WMs (#5265)
2016-06-25 07:15:21 +02:00
George Marques 6d37253be5
Fix Android sensors polling rate on resume
Fix #5306
2016-06-24 21:00:04 -03:00
volzhs 456b7733fc Fix string array parameter check with jni 2016-06-25 02:05:46 +09:00
volzhs a5a5bdef25 Remove duplicated aidl for android
Tested IAP function on device.
2016-06-25 01:11:21 +09:00
Ariel Manzur 10c512e46d added "arch" parameter, made iphone use it to build isim 2016-06-23 07:41:54 +02:00
Rémi Verschelde dc8c145488 iOS simulator: merge into iphone detect.py
Fixes #4489
2016-06-23 07:41:54 +02:00
Rémi Verschelde 0a72f9ccb8 Merge pull request #5362 from J08nY/png
libpng: New version 1.6.27
2016-06-23 07:40:03 +02:00
Rémi Verschelde 92ee868a94 Merge pull request #5358 from Keyaku/alert-for-osx
Added alert() functionality for OS X
2016-06-23 07:39:34 +02:00
Rémi Verschelde b9ed5b12c9 Merge pull request #5235 from volzhs/fix-android-export
fix errors while exporting android
2016-06-23 07:35:22 +02:00
Rémi Verschelde daa4180210 Merge pull request #5364 from RandomShaper/windows-high-contrast-compat
Make editor compatible with Windows high contrast themes
2016-06-23 07:16:13 +02:00
Juan Linietsky d6225b1e00 Improved binding system (ObjectTypeDB::bind_method) to be friendlier to statically typed languages, should help in the Mono integration.
Disabled by default.
2016-06-22 23:13:41 -03:00
Pedro J. Estébanez 85a5290ee8 Make editor compatible with Windows high contrast themes
By providing a manifest specifying the targeted Windows versions (as per https://msdn.microsoft.com/en-us/library/windows/desktop/hh404233(v=vs.85).aspx#_______supporting_high_contrast_themes_in_windows_8_and_later) now the Godot editor renders normally under a high contrast theme on Windows, instead of staying white/black.
2016-06-23 00:14:15 +02:00
J08nY 0ab05b09e4
Fixed iCCp chunk in pngs
neccesary for libpng 1.6.27 to work silently
2016-06-22 21:13:29 +02:00
Keyaku 072da51f20 Added alert() functionality for OS X 2016-06-22 16:58:31 +01:00
Rémi Verschelde 842e7bfc2f Merge pull request #5357 from volzhs/fix-locale-android
fix android resource locale
2016-06-22 16:05:59 +02:00
volzhs 591be5df25 fix android resource locale 2016-06-22 22:32:03 +09:00
volzhs 780fa60072 correct current Intent for android 2016-06-21 03:32:44 +09:00
Wilhem Barbier 5d95072879 Remove the vibration effect from the joystick when stopping 2016-06-20 11:01:07 +02:00
Rémi Verschelde 225fbe0a90 isim: Sync with iphone files list
Should fix broken build due to Appirater.
2016-06-20 08:31:42 +02:00
Rémi Verschelde 8a27835bca Merge pull request #5285 from brakhane/fix-memset
fix memset calls
2016-06-19 13:10:29 +02:00
Rémi Verschelde 57e1387199 Merge pull request #5225 from Hinsbart/x_rumble
Windows: Support gamepad vibration using XInput.
2016-06-19 12:59:18 +02:00
Rémi Verschelde 8f2115529e Merge pull request #5135 from volzhs/android-manifest
fix android support screen property for large screen
2016-06-19 12:49:42 +02:00
Dennis Brakhane 3d85a14404 fix memset calls
Order is "mem, val, count", not "mem, count, val"
2016-06-19 02:07:51 +02:00
Rémi Verschelde b7dbf9207a Drop empty files that are not used anywhere
Part of #5272
2016-06-18 19:46:30 +02:00
Juan Linietsky 61655d6dc2 Fixed make_dir and make_dir_recursive erros, closes #1680 closes #1872 2016-06-18 11:13:03 -03:00
Rémi Verschelde a7fc04626a Add missing license headers in our source files (#5255)
Also removes a couple wrong Godot headers from third-party source files.
2016-06-18 14:46:12 +02:00
volzhs e6bbe91994 fix errors while exporting android 2016-06-16 05:00:21 +09:00
Pedro J. Estébanez 1fcb2a1a00 Handle tmp files properly on Android export 2016-06-15 14:58:01 +02:00
Andreas Haas 0e8b860048 Windows: Support gamepad vibration using XInput. 2016-06-15 14:40:57 +02:00
Rémi Verschelde 01bb8787c9 Merge pull request #5212 from vnen/fix-emscripten-build
Fix javascript build in Windows
2016-06-15 13:23:00 +02:00
Wilhem Barbier f665200df7 Add joystick vibration support on Linux (#5043) 2016-06-15 07:25:35 +02:00
George Marques c48ffed87a
Fix javascript build in Windows
Fix #3438
2016-06-14 11:27:16 -03:00
Juan Linietsky 7526b14afd Merge pull request #5173 from Hinsbart/fix_xrandr
x11: fix XRandr GetMonitors
2016-06-13 15:45:42 -03:00
Juan Linietsky 5f674bdca1 Merge pull request #5179 from RandomShaper/better-android-export
Enhanced Android export
2016-06-13 15:06:37 -03:00
Pedro J. Estébanez e1948d520a Zip-align exported APK 2016-06-13 00:19:45 +02:00
Andreas Haas eaa34f2123 x11: fix XRandr GetMonitors 2016-06-12 15:29:02 +02:00
Juan Linietsky 3b2c96139b Merge pull request #4905 from Hinsbart/x11_dpi
x11: Implemented dpi detection
2016-06-11 17:52:10 -03:00
Juan Linietsky fc7adf0b4c property output unix seconds since epoch in windows get_system_time_secs, fixes #5155 2016-06-11 14:10:11 -03:00
Pedro J. Estébanez 1b189ad943 Fix typo 2016-06-11 13:11:42 +02:00
Pedro J. Estébanez bb1b51f470 Keep certain assets uncompressed on Android export 2016-06-11 13:08:42 +02:00
volzhs 4f64935ab6 fix android support screen property for large screen 2016-06-10 14:09:33 +09:00
Juan Linietsky 94a6ff3d7a -make freetype build for all platforms the same, default as builtin except on x11.
closes #5119
2016-06-09 21:28:07 -03:00
Andreas Haas 18c941bbec x11: Implemented dpi detection
depends on XRandR.
Had to dynamically load `XRRGetMonitors` as Ubuntu 12.04 doesn't have it.
Also removed libudev from travis install list.
2016-06-09 18:54:06 +02:00
Juan Linietsky 3d95c82669 Merge pull request #5090 from akien-mga/glew-1.13.0
Upgrade embedded GLEW to version 1.13.0
2016-06-08 07:54:31 -03:00
Juan Linietsky d61b91cbe0 -Heavily improved editor startup and exit performance 2016-06-07 22:10:09 -03:00
Rémi Verschelde 768e925271 GLEW: Define static + enabled and includes via SCons
This allows us not to have to hack our definitions in the upstream files,
making it easier to upgrade to newer versions in the future.

For the include paths to work, the headers are moved to a GL subfolder to
match their upstream location.
2016-06-08 00:16:27 +02:00
Rémi Verschelde 4c658dc523 Haiku: Do not define GLEW_ENABLED to undefine it later
Partial revert of f61eb5fd8e.
2016-06-08 00:10:30 +02:00
J08nY 3cfa920982
Windows: Hide mouse on MOUSE_MODE_CAPTURED
Fixes #5051
2016-06-07 12:57:01 +02:00
Rémi Verschelde aed5474238 Merge pull request #4729 from volzhs/android-23
Supporting Android API 23 (Android 6.0)
2016-06-07 09:45:24 +02:00
Juan Linietsky be830d10c2 Merge pull request #5026 from Geequlim/patch9frame-extension
Enhanced Patch9Frame
2016-06-06 20:15:33 -03:00
Juan Linietsky a1b696aa56 Merge pull request #5067 from Hinsbart/x11_vsync
x11: fix vsync support
2016-06-06 19:40:28 -03:00
Andreas Haas 5cd7611a9a x11: fix vsync support 2016-06-07 00:19:01 +02:00
J08nY 3fb3b7c1f7 Somewhat fixed Directory::get_space_left() return values. 2016-06-06 08:14:22 +02:00
Ariel Manzur 942de803f9 temporary fix for vsync call on x11 2016-06-05 22:25:01 -03:00
Juan Linietsky 2420e46b44 vsync support
-works on windows
-may not work on X11, if so please fix
-OSX does not seem to support disabling vsync
2016-06-05 19:14:33 -03:00
Juan Linietsky 007efb6a20 -customizable shortcuts in editor
-editor settings now save to .tres instead of .xml
-buttons can now hold a shortcut
2016-06-04 21:31:47 -03:00
Rémi Verschelde 2884faf55b Merge pull request #4999 from volzhs/fix-project-path
change invalid characters when get user data dir on Windows & Unix
2016-06-04 21:37:47 +02:00
Geequlim fdf914e53e Add texture region support for stylebox render 2016-06-05 00:45:53 +08:00
marcelofg55 76ab7d3886 Right click->Quit on the godot icon will now close the application on OSX.
Fixed get_window_position that missed a return on OSX.
2016-06-04 12:35:00 -03:00
marcelofg55 4e0f2389c3 Merge remote-tracking branch 'upstream/master' 2016-06-02 18:56:28 -03:00
volzhs 9073dc9963 change invalid characters when get user data dir on Windows & Unix
Can't create user data folder when project name has ``\ / : * ? " < > |`` characters on OS_Windows & OS_Unix.
So, change it to ``-`` to be able to make folder.

fixes #4928 and it's altanative to #4986.
2016-06-03 03:39:37 +09:00
George Marques 408c26ce0b
Remove Make-related flags from Android build
They were wrongly placed, creating a file named "-fpic" instead of
applying "-fpic" to the build. This file was in .gitignore, which made it
less noticiable.

This also adds build.gradle to .gitignore.
2016-06-01 21:14:57 -03:00
Juan Linietsky 4ec2b1434f removed dependency on shcore.dll to get DPI
fixes #4973
2016-06-01 12:43:52 -03:00
Juan Linietsky 344a39dafd Implemented file drop support in OSX 2016-05-31 01:27:48 -03:00
marcelofg55 bb223869e0 Key modifiers (Ctrl, Alt, Meta and Shift) may be used as Input keys now on OSX 2016-05-31 00:02:14 -03:00
Juan Linietsky cf3575e0b4 Merge branch 'master' of https://github.com/godotengine/godot 2016-05-30 00:29:36 -03:00
Juan Linietsky 9b1f8230ec -Some fixes to OSX retina scaling for window functions
-Implemented HiDPI detection and support for Godot Editor!
2016-05-30 00:28:29 -03:00
Rémi Verschelde e6e878e139 Icon: Remove more grey capsules behind official logo 2016-05-30 00:41:42 +02:00
Juan Linietsky c7d24b7814 hidpi for now not available on mingw, sorry 2016-05-29 14:34:06 -03:00
Juan Linietsky 4f100f92d8 DPI Detection support
Windows only for now.
Many builds may break (older visual studio, mingw32)
2016-05-29 13:40:21 -03:00
Rémi Verschelde d31696e3db Merge pull request #4874 from Hinsbart/x11_dragndrop
x11: Add support for filesystem drag & drop using xdnd
2016-05-29 18:40:27 +02:00
Rémi Verschelde 96bdab6edf Merge pull request #4845 from vnen/pr-magnetometer
Add magnetometer sensor support for Android
2016-05-29 18:37:33 +02:00
Rémi Verschelde 7d262947af Merge pull request #4810 from marcelofg55/master
Added application/fat_bits property for EditorExportPlatformOSX::Edit…
2016-05-29 18:28:10 +02:00
Andreas Haas 2c9b28df13 xdnd: can handle more than 3 different target types
Now dropping also works with Nemo and PCManFM(gtk)
2016-05-29 17:40:08 +02:00
Juan Linietsky 65615c0353 fix freetype paths on osx and mingw 2016-05-29 12:26:15 -03:00
Juan Linietsky 3e8eb396d7 Finalized DynamicFont implementation
-DynamicFont uses Freetype by default
-Editor fonts are now scalable thanks to this
-Cleaned up documentation browser and added fonts for this
2016-05-29 11:37:52 -03:00
Andreas Haas ae0a59731e x11: Add support for filesystem drag & drop using xdnd 2016-05-28 21:35:42 +02:00
fluffrabbit 4877b714b3
Add magnetometer sensor support for Android 2016-05-27 14:36:55 -03:00
Juan Linietsky 8be2fabbe5 Changed import workflow
-Rearrange favorites in fs dock with drag and drop
-Removed import -> sub-scene, moved to scenetree contextual menu
-Removed import -> re-import , moved and integrated to FS dock
-Added ability in FS dock to re-import more than one resource
simultaneously
-Added ability to drag from native filesystem explorer to Godot, only
works on Windows though
-Removed scene reimport merge options, never worked well. Eventually
merging materials should be re-added
-Added ability to set custom root node type when importing scenes
-Re-Import is now automatic, can be configured back to manual in editor
settings
-Added resource previews in property list for many resource types
2016-05-27 14:19:11 -03:00
marcelofg55 ba0fbe4f79 Added application/fat_bits property for EditorExportPlatformOSX::EditorExportPlatformOSX 2016-05-25 15:17:28 -03:00
volzhs e5d16eca46 Add comments for NotificationCompat to support API < 16 2016-05-25 22:19:37 +09:00
volzhs ff67c256f5 fix compatibility for Android API 14 with supporting API 23
using ``NotificationCompat`` in ``support-v4`` library will increase APK filesize a little bit, but it guarantees to run OK with API 4+
tested with API 19 and 23 devices
2016-05-24 11:22:35 +09:00
volzhs 5eb14d3af0 fix unexpected char: '\' error on windows
error occurred when register additional directory for android module on windows.

### config.py ###
```
def can_build(plat):
 return plat=="android"

def configure(env):
 if (env['platform'] == 'android'):
  env.android_add_res_dir("android/res")
```
2016-05-24 05:25:22 +09:00
Hubert Jarosz 33403d91f7
remove trailing whitespace 2016-05-21 15:29:25 +02:00
marcelofg55 eeb83982e2 Added 'fat' option for bits param on scons for osx, this will produce a fat binary that contains both 32 bits and 64 bits binaries 2016-05-20 17:31:30 -03:00
volzhs 160713d4d3 Supporting Android API 23 (Android 6.0)
If we update build gradle to use ``compileSdkVersion 23``,
``org.apache.http`` package causes error. (issue #4711)

We need to use ``useLibrary 'org.apache.http.legacy'`` to solve this problem.
To use ``useLibrary``, we need to use latest gradle also.

And now, we faced another problem with ``APK Expansion`` java sources.

```
/platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java
137 :             mCurrentNotification.setLatestEventInfo(mContext, mCurrentTitle, mCurrentText, mContentIntent); // causes error
```

So, some of APK Expansion java sources are updated by referencing commits from https://github.com/danikula/Google-Play-Expansion-File
And dropped V3CustomNotification.java which was for android 3.0, since godot supports android 14 (4.0) above officially.

Unfortunately, another problem, The 'MissingTranslation' error was occurred.
So, build.gradle is updated to use ``disable 'MissingTranslation'``

Additionally, I updated ``buildToolsVersion``, ``targetSdkVersion`` to latest version.

I tested APK Expansion funtionality on Android 6.0 (Nexus 9, Nexus 6p) and Android 4.4 (Galaxy Note 2)  with Google Developer console.
2016-05-20 22:57:49 +09:00
Rémi Verschelde 5e0f0a962a Android buildsystem: Drop obsolete NDK_TOOLCHAIN argument
It was a duplicate of NDK_TARGET, and not used for anything.
2016-05-19 10:44:18 +02:00
marcelofg55 b697de92ef OS.get_screen_size now returns the correct value on OSX 2016-05-11 11:44:10 -03:00