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

1549 commits

Author SHA1 Message Date
Rémi Verschelde a8ee9a6116
Merge pull request #14434 from Smjert/fix/13447/vsync 
Fixes vsync setting ignored when using a separate thread for rendering
 2017-12-09 13:21:36 +01:00
Rémi Verschelde ae012f2381 Windows export: Use WINE to run rcedit on non-Windows host 
WINE can be either run from a provided path ("export/windows/wine"),
or looked up in the system PATH.

Fixes #14441.
 2017-12-09 11:42:08 +01:00
Rémi Verschelde 3fd1c0c76b
Merge pull request #14437 from vnen/rcedit 
Call rcedit on export for Windows desktop
 2017-12-09 10:48:19 +01:00
George Marques 78a7241911
Call rcedit on export for Windows desktop 
- Add an editor setting to read the rcedit path.
- Add settings to the export preset with icon and other exe information
(version, name, copyright, etc.)
 2017-12-09 01:31:10 -02:00
Stefano Bonicatti c067cf2c6a Fixes vsync setting ignored when using a separate thread for rendering 
Setting the vsync in the main thread, after the rendering thread starts
and takes the OpenGL context fails, so we need to do that before.
Also, for some reason, the main thread cannot make current the context
anymore.

Fixes #13447
 2017-12-09 01:43:23 +01:00
MattUV 93231819c2 Fix Manage Export Templates link 
In some cases, the link to download export templates was missing.
Fixes #14391
 2017-12-08 00:46:03 +01:00
Rémi Verschelde fbd270bfa8
Merge pull request #14356 from volzhs/ios-delegate-master 
use application:didFinishLaunchingWithOptions: instead of application…
 2017-12-07 09:33:34 +01:00
Rémi Verschelde 13c2ff9320 Style: Apply new clang-format 5.0 style to all files 2017-12-07 08:02:00 +01:00
Rémi Verschelde d5ca9e2f6f Style: Apply clang-format again on all files 
Fixes issues introduced by newer clang-format versions or commits
pushed directly without using the clang-format pre-commit hook.
 2017-12-07 08:02:00 +01:00
MrCdK 651677f033 Fix windows compilation when using MinGW 2017-12-07 04:59:11 +01:00
volzhs b87abeb9f9 use application:didFinishLaunchingWithOptions: instead of applicationDidFinishLaunching: for iOS 2017-12-07 10:09:05 +09:00
bruvzg 69dca1722f Use run-time dynamic linking for AddDllDirectory and RemoveDllDirectory to support mingw-w64 build and Windows 7 with KB2533623. 2017-12-07 00:20:42 +01:00
Pedro J. Estébanez 6f3343f1ce Remove guards for the now targeted Windows 7+ 2017-12-06 23:47:09 +01:00
Pedro J. Estébanez 0d48af4afd Add build param for targeted Windows version 2017-12-06 23:47:09 +01:00
Pedro J. Estébanez d089e688b0 Improve/fix multitouch on Windows 
- Fix logic error.
- Track touches to enable defensive handling and releasing on focus out.
- Change comment-out by preprocessor `#if`.
- Track/report coordinates as float.
 2017-12-06 23:47:09 +01:00
Pedro J. Estébanez 6decbec461 Implement multitouch on X11 2017-12-06 23:47:09 +01:00
Rémi Verschelde e7b7e7b7b0
Merge pull request #14318 from endragor/compile-sdk-version-26 
Update Android compileSdkVersion to 26
 2017-12-06 19:14:31 +01:00
Ruslan Mustakov b697444bc8 Update Android compileSdkVersion to 26 2017-12-06 22:35:15 +07:00
Unknown fd1b94e307 Improve slang, especially in user-visible parts 2017-12-05 15:41:38 +01:00
Juan Linietsky af27414b1c
Merge pull request #13850 from endragor/fix-iphone-gdnative 
Fix open_dynamic_library override in OSIPhone
 2017-12-03 04:57:03 -03:00
Ruslan Mustakov 59451c5b8d Fix open_dynamic_library override in OSIPhone 
Was broken at 9678231b10
 2017-12-03 14:49:12 +07:00
bruvzg 4899d91732 Add macOS shell_open URL escaping 2017-12-01 16:48:21 +02:00
Juan Linietsky 0243803117 Properly take into consideration that VERTEX must be written to in opaque pre pass, does some speed up to scenes using triplanar. 2017-12-01 08:45:36 -03:00
Bastiaan Olij 4c930f3663 Needed a broader search path flag 2017-12-01 00:34:37 +11:00
Juan Linietsky 9678231b10 Changed the dynamic library open function to allow setting the path of the library to open extra libraries. 2017-11-30 10:00:55 -03:00
Indah Sylvia 1746fbd1c6 Enhanced iOS and UWP logo on Export dialog 2017-11-29 17:34:01 +07:00
Rémi Verschelde f0b43678c4
Merge pull request #13383 from Krakean/fix_whitescreen 
Fixed fleeting window white screen on editor/game startup
 2017-11-29 09:11:18 +01:00
Rémi Verschelde 76725b6c1f
Merge pull request #13387 from rraallvv/refactor 
Add target helper functions and refactor (master)
 2017-11-29 08:54:59 +01:00
Rhody Lugo a65c0939fd disable caching for targets using helper functions 2017-11-28 23:24:12 -04:00
Dmitry Koteroff 7f26fba8cb Fixed white screen on editor/game startup by moving window displaying to a bit later phase 2017-11-29 03:49:36 +03:00
Leon Krause 640d8cc5d2 Fix inverted relative mouse motion in HTML5 export 2017-11-29 00:56:47 +01:00
Rhody Lugo a4a222d62d use the same cache for all branches for appveyor 2017-11-28 03:23:33 -04:00
Rémi Verschelde af9c67db0c Allow customizing user:// path (folder in OS::get_data_path()) 
This allows to specify any valid folder name (including with subfolders) to use
as user:// on all platforms. The folder is constrained to the platform-specific
OS::get_data_path() (typically what `XDG_DATA_HOME` resolves to).

Fixes #13236.
 2017-11-26 19:02:32 +01:00
Rémi Verschelde e1cf789593
Merge pull request #13278 from eska014/jseval-returntypes 
Remove contrived JavaScript.eval() return types
 2017-11-25 15:59:43 +01:00
Leon Krause 8de25d6e62 Remove contrived JavaScript.eval return types 2017-11-25 15:38:02 +01:00
Rémi Verschelde d9faf6f2f4 Fix build on macOS and Android after bc2e8d99 2017-11-25 10:42:20 +01:00
Indah Sylvia ac92c147c6 Completed bc2e8d99e5 so that windows can be built 2017-11-25 11:12:07 +07:00
Juan Linietsky bc2e8d99e5 Made Vector::ptrw explicit for writing, compiler was sometimes using the wrong function, 
leading to unnecesary copy on writes and reduced performance.
 2017-11-25 00:09:40 -03:00
Ruslan Mustakov 871deb6878 Allow to specify multiple resolution Android icons 2017-11-24 11:19:22 +07:00
Rémi Verschelde bedcbdd420
Merge pull request #13130 from endragor/gdnative-android-export 
Proper GDNative export on Android
 2017-11-21 23:59:01 +01:00
Ruslan Mustakov ebf9b80a47 Proper GDNative export on Android 2017-11-21 20:40:31 +07:00
Rémi Verschelde 6c9ee1f125
Merge pull request #13133 from endragor/resurrect-file-logging 
Return and repair file logging
 2017-11-21 14:25:33 +01:00
Ruslan Mustakov d42c5646a5 Return and repair file logging 
And make it configurable, too.
 2017-11-21 16:43:44 +07:00
Bernhard Liebl 80ad8afc85 Native pan and zoom for macOS 2017-11-21 09:11:39 +01:00
Ruslan Mustakov 8f0f327f02 Allow configuring iOS export 
- EditorExportPlugin's _export_begin accepts all the arguments related
   to the current export (is_debug, path, flags).

 - EditorExportPlugin API is extended with methods allowing to configure
   iOS export: add_ios_framework, add_ios_plist_content,
   add_ios_linker_flags, add_ios_bundle_file.

 - iOS export template now contains Godot as a static library so that
   it can be linked with third-party Frameworks and GDNative static
   libraries.

 - Adds method to DirAccess for recursive copying of a directory.

 - Fixes iOS export to work with Xcode 9 (released recently).
 2017-11-21 01:16:49 +07:00
Rémi Verschelde 450bdda97a
Merge pull request #12387 from santouits/x1111 
Fix x11 boot logo position in fullscreen and in maximized
 2017-11-20 15:48:08 +01:00
Rémi Verschelde fa8bc8ef13
Merge pull request #13061 from eska014/html5-export 
Export boot splash image and add option for custom HTML shell file in HTML5 export
 2017-11-20 08:59:23 +01:00
Rémi Verschelde 83e7287752
Merge pull request #13053 from akien-mga/methods-mkstr 
Remove need to _MKSTR version strings and rename "revision" to "build"
 2017-11-20 08:54:19 +01:00
Konstantin Zaitsev 79178e75cd Set android 'compileSdkVersion' to 24 2017-11-20 10:45:59 +07:00
Rémi Verschelde 3fd23da5ee Rename the version's "revision" to "build" 
That "revision" was inherited from SVN days but had been since then
used to give information about the build: "custom_build", "official",
"<some distro's build>".

It can now be overridden with the BUILD_NAME environment variable.
 2017-11-20 00:51:14 +01:00
Rémi Verschelde 6947bed015 Pass engine name and version parts as proper strings 
Removes the need for _MKSTR all over the place which has the drawback of
converting _MKSTR(UNKNOWN_DEFINE) to "UKNOWN_DEFINE" instead of throwing
a compilation error.
 2017-11-20 00:51:14 +01:00
Rémi Verschelde ecf80fbbba
Merge pull request #12988 from akien-mga/xdg-home-paths 
Add support for XDG Base Directory spec
 2017-11-20 00:42:51 +01:00
Leon Krause ae859fb81e Export boot splash and add custom HTML file option in HTML5 export 2017-11-20 00:06:11 +01:00
Rémi Verschelde 6ace4011e4
Merge pull request #13045 from akien-mga/gles2-cleanup 
Cleanup old references to GLES2 renderer
 2017-11-19 21:36:00 +01:00
Rémi Verschelde 6e3f2f44af Use new XDG folders to dehardcode paths 2017-11-19 20:54:26 +01:00
Rémi Verschelde 32c12a92a5 Add initial support for the XDG Base Directory spec 
Spec version 0.7 from https://standards.freedesktop.org/basedir-spec/basedir-spec-0.7.html
(latest as of this commit).

Three virtual methods are added to OS for the various XDG paths we will use:
- OS::get_data_path gives XDG_DATA_HOME, or if missing:
  ~/.local/share on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows
- OS::get_config_path gives XDG_CONFIG_HOME, or if missing:
  ~/.config on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows
- OS::get_cache_path gives XDG_CACHE_HOME, or if missing:
  ~/.cache on X11, ~/Library/Caches on macOS and %APPDATA% on Windows

So for Windows there are no changes, for Linux we follow the full split spec
and for macOS stuff will move from ~/.godot to ~/Library/Application Support/Godot.

Support for system-wide installation of templates on Unix was removed for now,
as it's a bit hackish and I don't think anyone uses it.

user:// will still be OS::get_data_path() + "/godot/app_userdata/$name" by
default, but when using the application/config/use_shared_user_dir option
it will now use XDG_DATA_HOME/$name, e.g. ~/.local/share/MyGame.

For now everything still goes in EditorSettings::get_settings_dir(), but
this will be changed in a later commit to make use of the new splitting
where relevant.

Part of #3513.
 2017-11-19 20:54:24 +01:00
Rémi Verschelde f0795ae2fe
Merge pull request #13044 from eska014/enginejs 
Change HTML5 start-up API
 2017-11-19 20:18:00 +01:00
Rémi Verschelde d629a753ec
Merge pull request #13033 from MednauN/master 
Add currency code to iOS product details response
 2017-11-19 18:16:38 +01:00
Rémi Verschelde 9f134aa5d1 Cleanup old references to GLES2 renderer 
There are still some left in the Android Java code, even stuff to swap between
GLES1 and GLES2 support from early Godot days... would be good to see some cleanup
there too one day.

The "graphics/api" option for Android exports is removed, as only GLES 3.0 is supported.
It can be readded when GLES 2.0 support comes back. Fixes #13004.
 2017-11-19 17:52:18 +01:00
Rémi Verschelde 992a40a50d
Merge pull request #12961 from eska014/platform-doc 
Facilitate documenting platform-exclusive classes
 2017-11-19 16:19:47 +01:00
Leon Krause 35adf718cf Change HTML5 start-up API 
Rename engine.start() to startGame(), new start() takes string arguments
handed directly to main(). Rename Engine.loadEngine() to load().

Add setLocale(), setResizeCanvasOnStart(), setExecutableName() and
preloadFile().
 2017-11-19 15:39:57 +01:00
Evgeny Zuev 785f364bb0 Add currency code to iOS product details response 2017-11-19 15:47:27 +07:00
Leon Krause ddf21ca016 Remove asm.js support from HTML5 platform 
Since WebGL 2.0 is required, requiring WebAssembly support as well has
little impact on compatibility.
 2017-11-18 05:52:14 +01:00
Leon Krause 63b1a096eb Facilitate exposing platform-exclusive interfaces to all platforms 
This makes the interfaces available, without implementation, in other
platforms and the editor, which facilitates documenting platform-exclusive
classes.

Platform-exclusive APIs must be set up in platform/<platform>/api/api.cpp.
Provide noop method-implementations where necessary.

Also setup and document the HTML5 platform's JavaScript singleton.
 2017-11-18 03:54:21 +01:00
Rémi Verschelde ad199c3964 EditorSettings: Rename settings_path to settings_dir 
Also to prepare for upcoming refactoring for XDG support.
 2017-11-17 20:55:09 +01:00
Rémi Verschelde 73049d115e Rename OS::get_data_dir to OS::get_user_data_dir 
Will be needed to avoid confusion with system data path (XDG_DATA_HOME)
and editor data dir in upcoming refactoring.
 2017-11-17 20:55:09 +01:00
Rémi Verschelde d629fd9a36
Merge pull request #12606 from rraallvv/window_position 
Fix window position on macOS (master)
 2017-11-17 00:36:16 +01:00
Leon Krause 6b34f10ab1 Fix HTML5 HTTPClient includes 2017-11-15 23:02:36 +01:00
Rémi Verschelde 61a693cf78
Merge pull request #12922 from eska014/engine-singletons 
Singleton management changes
 2017-11-14 20:44:55 +01:00
Leon Krause 9b7b46143d Move singleton management from ProjectSettings to Engine 2017-11-14 15:15:13 +01:00
Rhody Lugo 2355f545ec fix window position computation on macOS 2017-11-14 08:59:22 -04:00
Rémi Verschelde ba7e00dfef
Merge pull request #12885 from rraallvv/osx_android_travis 
travis: caching Android, iOS, macOS (cross-compile) (master)
 2017-11-13 21:44:23 +01:00
Rhody Lugo 7f3ecd4227 change matrix and enable caching for Android, iOS and macOS (cross-compile) 2017-11-13 15:05:26 -04:00
Juan Linietsky 2e3a1caa06 Disable OpenGL warnings unless running with -v, closes #7171 2017-11-13 13:40:07 -03:00
Leon Krause 159c2ec69c Fix HTML5 mouse button release events 2017-11-13 16:14:08 +01:00
Rémi Verschelde 0dd96bccd3
Merge pull request #12867 from eska014/html5-http 
Implement HTTPClient in HTML5 platform
 2017-11-13 08:32:32 +01:00
Leon Krause 2970061a73 Implement HTTPClient in HTML5 platform 
Limitations:

 - Subject to same-origin policy
 - No persistent connection (but simulated for compatibility)
 - No blocking mode
 - No StreamPeer access
 - No chunked responses
 - Cannot disable host verification
 2017-11-13 00:58:29 +01:00
Bastiaan Olij 6205eb40e7 Align sensors and implement gravity sensor for Android 2017-11-11 09:42:23 +11:00
Rémi Verschelde ed57f0a0d4 Remove get_default_video_mode definition on OSX/iOS 
It had been missed in d09160a8b6 and broke compilation
for those platforms.

Took the opportunity to run clang-format on the code base to fix some corner cases
that went through our static tests/were overlooked recently.
 2017-11-09 23:36:08 +01:00
George Marques a3387a9e22
UWP: Update to build with Windows SDK 10.16229.0 
- Update the OpenSSL shim to work with the new SDK
- Change the ARM platform detection to work with VS2017
 2017-11-09 16:06:44 -02:00
Rémi Verschelde 2507818f05
Merge pull request #12782 from rraallvv/unified_headers_fix 
add missing distutils.version.LooseVersion import
 2017-11-09 17:17:35 +01:00
Juan Linietsky d09160a8b6 Make video mode initialization more intuitive, fixes #12022 2017-11-09 13:02:26 -03:00
Rhody Lugo 7957bbf558 add missing distutils.version.LooseVersion import 2017-11-09 11:58:29 -04:00
Rhody Lugo 7664a0feac unified headers fix 2017-11-09 09:46:43 -04:00
AndreaCatania e44408f653 Compile Android with STL enabled by default 2017-11-08 12:51:35 +01:00
Rémi Verschelde 9437db7bc5
Merge pull request #12604 from rraallvv/unified_headers 
add support for Android NDK unified headers (master)
 2017-11-06 16:07:00 +01:00
Rhody Lugo ec31b23b33 add support for Android NDK unified headers 2017-11-06 07:51:09 -04:00
volzhs 00ce629bc6 Prevent to stop music in another background app on iOS 2017-11-06 20:16:34 +09:00
Rémi Verschelde e20241c02c
Merge pull request #12691 from eska014/webaudio 
Fix WebAudio and HTML5 build
 2017-11-06 09:36:13 +01:00
Leon Krause 1a5d3c26db Fix WebAudio and HTML5 build 2017-11-06 00:25:57 +01:00
Rémi Verschelde 5bc2cf257b Convert DOS line endings to Unix line endings 
Should fix issues some of us have with `misc/dist/uwp_template/AppxManifest.xml`
always showing up as modified.
Might cause issues on Windows due to the removal of BOMs or change of line endings
in some of the Mono, UWP or gradlew.bat files, we will test and adapt if need be.
 2017-11-05 11:37:59 +01:00
Juan Linietsky 7715a261d5
Merge pull request #12262 from AndreaCatania/pplug 
Physics server plug
 2017-11-03 23:39:44 -03:00
AndreaCatania 7a9ca08f16 Implemented physics plug 
Moved init_physics

Implemented physics 2D plug

Fix clang

Fix clang

Fix static check

Fix clang

Fix static check

Moved physics server initialization

Moved physics server settings initialization
 2017-11-04 03:25:51 +01:00
Rémi Verschelde cefdb34f6c SCons: make use_lto a global option and opt-in for iphone 
Supersedes #12553, see discussion in #12552.
 2017-11-02 09:11:50 +01:00
N0hbdy f3fc07272c Add Colemak keybindings to editor for osx 2017-10-30 22:51:02 +01:00
Marcelo Fernandez be6ac69f75 Implemented OS get_latin_keyboard_variant on x11 2017-10-30 12:14:40 -03:00
Rémi Verschelde 62a3dcdc72
Merge pull request #12467 from marcelofg55/emscripten_detect 
Detect javascript platform using EMSCRIPTEN env as well

[ci skip]
 2017-10-30 11:43:03 +01:00
Rémi Verschelde 87694d1884 Disable logging until the logs location is sorted out 
Temporary workaround for #12277.
 2017-10-29 15:50:27 +01:00
Marcelo Fernandez 33daf4d8bc Detect javascript platform using EMSCRIPTEN env as well 2017-10-28 16:24:44 -03:00
Rémi Verschelde 0c043bc257
Merge pull request #12442 from mhilbrunner/patch-1 
detect.py: Fix KeyError if using MinGW and LTO
 2017-10-27 21:22:37 +02:00