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

1089 commits

Author SHA1 Message Date
Fabio Alessandrelli 1aff508dd9 IP_Address now handle IPv4 and IPv6 transparently 
IP_Address changes:
- Converts to and from String transparently while handling IPv4 as IPv6
  mapped (::ffff:[IP]) address internally.
- Completely remove AddrType enum.
- Setting/Getting of ip array is now only possible through dedicated functions
  (ie. set_ipv4, get_ipv4, set_ipv6, get_ipv6)
- Add function to know if the address is a valid IPv4 (for IP implementation and enet)
 2016-12-09 18:24:59 +01:00
Fabio Alessandrelli c18c5013f8 Migrate int.IP_TYPE_ constants to IP.TYPE_ 2016-12-09 18:24:59 +01:00
Fabio Alessandrelli 4d90a4fcd5 Move V6ONLY flag selection inside helpers 2016-12-09 18:24:59 +01:00
Fabio Alessandrelli 9200da58e4 Automatically map IPv4 address to IPv6 when needed 2016-12-09 18:24:59 +01:00
Fabio Alessandrelli 95bdd97768 Use an instance variable for ip_type in raw sockets 
PacketPeerUDP/StreamPeerTCP/TCP_Server now uses an instance variable
to store the selected ip_type (IPv4/IPv6/ANY, where ANY = dual stack).
All calls to resolve addresses, sending/receving data, connecting/listening
will use that socket type.
 2016-12-09 18:24:59 +01:00
Fabio Alessandrelli 4f07b595a1 Properly handle tcp connection failure 2016-12-09 18:24:58 +01:00
Rémi Verschelde 752f630f4e Merge pull request #7219 from eska014/separate-asmjs 
Fix browser lockups in web export startup
 2016-12-02 08:57:33 +01:00
Rémi Verschelde fb932d0f50 Merge pull request #7217 from eska014/js-os 
Work on asm.js and WebAssembly platforms
 2016-12-02 08:56:53 +01:00
eska 290d79f26c Emit asm.js code into a dedicated file for asm.js export 
This helps prevent browser lockups during start-up at the cost of having
to distribute an extra file.
 2016-11-30 23:47:38 +01:00
eska 3e1b437315 Add window features in web export 
- Add 'window' (canvas) resize, maximize and fullscreen
 - Implement get_screen_size
 - Fix fullscreen resolution
 2016-11-30 22:04:35 +01:00
eska 30e9ea5a82 Fix some mouse bugs in WebAssembly/asm.js 
- Emit mouse wheel release events
 - Set button masks, fixes #5092
 2016-11-30 22:02:32 +01:00
eska a6ae3204fb OS additions and fixes for WebAssembly/asm.js 
- Implement alert, shell_open, set_window_title
 - Add locale lookup, fixes #2477
 - Print without color control sequences
 - Move get_executable_path implementation to OS_JavaScript
 2016-11-30 22:01:55 +01:00
Rémi Verschelde ab637bc812 Merge pull request #7201 from volzhs/android-alert 
Add alert window on Android
 2016-11-28 15:32:40 +01:00
Rémi Verschelde f28ff8a208 Fix console output for MinGW compilers 
Reworked patch from @jay3d (#7116).
 2016-11-28 15:12:54 +01:00
volzhs 9a20068ab7 Add alert window on Android 2016-11-28 10:20:57 +09:00
BastiaanOlij da5651fbb9 Set minimum version to 10.9 building OSX 2016-11-25 00:55:13 +11:00
Rémi Verschelde f18470c199 Revert "X11: Fix maximized boot splash" 
This reverts commit 8d3efe2b7d.
It introduced crashes for some users when trying to capture
the XConfigureNotify event.
 2016-11-23 07:53:31 +01:00
Juan Linietsky 9d635f0629 Migrated from GLES to GLAD, fixes many issues. 2016-11-22 20:51:56 -03:00
Rémi Verschelde d5a9102a88 Merge pull request #7125 from Hinsbart/x11_maximize 
X11: Fix maximized boot splash
 2016-11-21 11:54:49 +01:00
Rémi Verschelde 4965ddfaa1 png: Allow building shared freetype with bundled libpng 
This was the behaviour when building Godot 2.1, which allows to build against
Ubuntu 12.04 and its freetype that links old libpng12, while still bundling
libpng16.
 2016-11-19 14:09:01 +01:00
Rémi Verschelde c32766a482 Revert "libpng: Fix erroneously linking against libpng12 on old distros" 
This reverts commits 5fa1bb331a
and ec4be71fad.

Looks like Debian/Ubuntu are not even shipping libpng16 nowadays in their
stable releases, we'll have to go back to statically linking our own
libpng16 to wait for them to stop being 5 years behind everybody.
 2016-11-19 13:39:03 +01:00
Rémi Verschelde ec4be71fad libpng: Same fix as previous commit for server platform 2016-11-19 13:25:17 +01:00
Rémi Verschelde 5fa1bb331a libpng: Fix erroneously linking against libpng12 on old distros 
This bit us for 2.1.1 binaries built on Ubuntu 12.04 LTS where
libpng.pc apparently prioritizes libpng12.
 2016-11-19 12:59:48 +01:00
Andreas Haas 8d3efe2b7d
X11: Fix maximized boot splash 
When instructing the window manager to (un)maximize a window, the resulting resolution
is recieved via an XEvent of type "ConfigureNotify".

The problem here was that these events were only handled in the `OS_X11::process_xevents()` method,
which is initially called on the first iteration of the main loop.
Because of this, the VideoMode still hadn't been updated yet when doing the boot splash setup.
 2016-11-16 02:04:39 +01:00
Rémi Verschelde d314c24d72 Merge pull request #7110 from RandomShaper/patch-2 
Update/fix Android build
 2016-11-14 08:27:44 +01:00
Rémi Verschelde 715ab48a54 Merge pull request #7107 from eska014/wasm 
Some WebAssembly stuff
 2016-11-14 08:26:24 +01:00
Pedro J. Estébanez 5a26459c06 Update/fix Android build 
Fix wrong path for 32-bit Windows, which fixes #7084
Exclude 32-bit Windows from multi-threaded linking because it's not supported by the NDK
Remove 32-bit Linux as there is no NDK variant for it
 2016-11-13 23:54:06 +01:00
eska d87b1d1338 Remove explicit BINARYEN_METHOD for WebAssembly build 
This option is the default since Binaryen version 21.
 2016-11-13 15:38:12 +01:00
eska 82addf2ffe Enable memory growth in WebAssembly builds 
This allows setting TOTAL_MEMORY during runtime at the cost of reserving
a bit more memory.
 2016-11-13 15:29:03 +01:00
Rémi Verschelde 84822c3dbf Merge pull request #7079 from RandomShaper/quicker-android-export 
Make Android export quicker (especially on Windows)
 2016-11-11 10:52:10 +01:00
Rémi Verschelde 22542bc767 Merge pull request #7030 from volzhs/fix-dir-access-android 
Fix Directory.dir_exist/get_current_dir for 'res://' on Android
 2016-11-09 12:54:59 +01:00
Pedro J. Estébanez 56721e5d9d Make Android export quicker (especially on Windows) 2016-11-08 20:56:17 +01:00
volzhs 8d454ed9a7 Fix Directory.dir_exist/get_current_dir for 'res://' on Android 
Fix #7014
 2016-11-09 01:50:00 +09:00
ISylvox b5c383fd61 vsnc --> vsync 2016-11-08 21:06:57 +07:00
Rémi Verschelde be4eff1d8b Merge pull request #7019 from vnen/rename-winrt-uwp 
Rename WinRT platform to UWP
 2016-11-06 12:03:10 +01:00
Rémi Verschelde 5e360fe178 server: Allow building against system libraries 2016-11-03 22:53:18 +01:00
George Marques 411faaa6f4
Rename remaining WinRT references to UWP 2016-11-03 14:51:08 -02:00
George Marques b113c7b7a3
Rename WINRT_ENABLED to UWP_ENABLED 2016-11-03 14:51:08 -02:00
George Marques fb5a73a39f
Rename WinRT files to UWP 2016-11-03 14:51:08 -02:00
Rémi Verschelde cc95d4448c scons: Reorder options for clarity 
Also prefix all thirdparty-related toggles with `builtin`.
 2016-11-03 07:45:08 +01:00
Pedro J. Estébanez b18ff942be Improve Android build (Clang + tidyness) 2016-11-02 10:54:51 +01:00
Rémi Verschelde f34151ff0f style: Various other PEP8 fixes in Python files 
Done with `autopep8 --select=E7`, fixes:

- E701 - Put colon-separated compound statement on separate lines.
- E702 - Put semicolon-separated compound statement on separate lines.
- E703 - Put semicolon-separated compound statement on separate lines.
- E711 - Fix comparison with None.
- E712 - Fix (trivial case of) comparison with boolean.
- E713 - Fix (trivial case of) non-membership check.
- E721 - Fix various deprecated code (via lib2to3).
 2016-11-01 00:35:16 +01:00
Rémi Verschelde 817dd7ccbb style: Fix PEP8 blank lines issues in Python files 
Done with `autopep8 --select=E3,W3`, fixes:

- E301 - Add missing blank line.
- E302 - Add missing 2 blank lines.
- E303 - Remove extra blank lines.
- E304 - Remove blank line following function decorator.
- E309 - Add missing blank line.
- W391 - Remove trailing blank lines.
 2016-11-01 00:35:16 +01:00
Rémi Verschelde d4c17700aa style: Fix PEP8 whitespace issues in Python files 
Done with `autopep8 --select=E2,W2`, fixes:

- E201 - Remove extraneous whitespace.
- E202 - Remove extraneous whitespace.
- E203 - Remove extraneous whitespace.
- E211 - Remove extraneous whitespace.
- E221 - Fix extraneous whitespace around keywords.
- E222 - Fix extraneous whitespace around keywords.
- E223 - Fix extraneous whitespace around keywords.
- E224 - Remove extraneous whitespace around operator.
- E225 - Fix missing whitespace around operator.
- E226 - Fix missing whitespace around operator.
- E227 - Fix missing whitespace around operator.
- E228 - Fix missing whitespace around operator.
- E231 - Add missing whitespace.
- E231 - Fix various deprecated code (via lib2to3).
- E241 - Fix extraneous whitespace around keywords.
- E242 - Remove extraneous whitespace around operator.
- E251 - Remove whitespace around parameter '=' sign.
- E261 - Fix spacing after comment hash.
- E262 - Fix spacing after comment hash.
- E265 - Format block comments.
- E271 - Fix extraneous whitespace around keywords.
- E272 - Fix extraneous whitespace around keywords.
- E273 - Fix extraneous whitespace around keywords.
- E274 - Fix extraneous whitespace around keywords.
- W291 - Remove trailing whitespace.
- W293 - Remove trailing whitespace.
 2016-11-01 00:35:16 +01:00
Rémi Verschelde 97c8508f5e style: Start applying PEP8 to Python files, indentation issues 
Done with `autopep8 --select=E1`, fixes:

- E101 - Reindent all lines.
- E112 - Fix under-indented comments.
- E113 - Fix over-indented comments.
- E115 - Fix under-indented comments.
- E116 - Fix over-indented comments.
- E121 - Fix a badly indented line.
- E122 - Fix a badly indented line.
- E123 - Fix a badly indented line.
- E124 - Fix a badly indented line.
- E125 - Fix indentation undistinguish from the next logical line.
- E126 - Fix a badly indented line.
- E127 - Fix a badly indented line.
- E128 - Fix a badly indented line.
- E129 - Fix a badly indented line.
 2016-11-01 00:33:51 +01:00
eska d6f2862429 Add option 'wasm' to compile to WebAssembly in web export 
WebAssembly is still experimental, so disabled by default.

The HTML shell file now uses $GODOT_BASE, a placeholder for the
base filename, instead of $GODOT_JS, $GODOT_MEM and $GODOT_FS.
 2016-10-31 01:28:01 +01:00
Rémi Verschelde 7384a6519f Merge pull request #6993 from eska014/remove-js-compression 
Remove JavaScript compilation option 'compress'.
 2016-10-31 12:43:57 +01:00
Rémi Verschelde 434d120226 Merge pull request #6981 from Faless/ipv6_fix 
Use IPv6 dual stack socket by default. Allow restricting IP version for TCP/UDP.
 2016-10-31 08:00:54 +01:00
Rémi Verschelde c6c13eb8fc Merge pull request #6490 from zaps166/webm-pr 
Add WebM support
 2016-10-30 18:12:00 +01:00
Fabio Alessandrelli eb27e993f0 TCP/UDP Listen sockets can now be set to IPv6 only 2016-10-30 17:46:05 +01:00
Fabio Alessandrelli 812908e236 Fix windows debugger connection problems. 
Unify network socket creation between platform.
Ensure IPV6_V6ONLY flag is not set on sockets (allow IPv4 connection in IPv6 socket, dual-stack).
 2016-10-30 17:46:05 +01:00
Fabio Alessandrelli ee69bd81cf TCPServer listen now default to IP type ANY (v6 socket with v4 support) 2016-10-30 17:46:05 +01:00
George Marques a52cbd65a8 Merge pull request #6937 from SuperUserNameMan/fix_win_standalone_msvc_and_mingw_incompatibilities 
fix bug introduced by #6501
 2016-10-28 20:57:51 -02:00
Juan Linietsky 53d8f2b1ec PBR more or less working, still working on bringing gizmos back 2016-10-27 11:50:26 -03:00
yg2f f7773d499d fix bug introduced by #6501 
( @Akien : this PR is for current HEAD only, not to be cherry-picked for 2.1.1 )

this is manual revertion of #6501 which introduced a bug that prevented
scons from detecting Mingw under Windows when MSVC was installed.
(thanks to @vnen for finding this)

AND
it fixes the actual bug that prevented scons from detecting MSVC standalone
compiler ( a confusions between ``VSINSTALLDIR`` and ``VCINSTALLDIR`` )

The freeware Standalone MSVC C++ Build Tools are available here :
http://landinghub.visualstudio.com/visual-cpp-build-tools
 2016-10-26 19:29:30 +02:00
Fabio Alessandrelli 25e29972a9 Fix PacketPeerUDP get_packet_port() 
Properly convert port field from network to system ordering on incoming packets.
 2016-10-26 18:27:01 +02:00
Rémi Verschelde c67e3a485d Merge pull request #6925 from godotengine/ipv6 
Adding IPv6 support
 2016-10-26 14:32:51 +02:00
Fabio Alessandrelli 80e911647c Pass correct address size (ipv4,ipv6) to socket connect, bind, sendto 
The address size passed to network system calls now reflects the the actual IP type (v4 or v6).
Fix Windows and OSX ipv6 sockets
 2016-10-26 08:20:31 +02:00
Błażej Szczygieł d710b265f8 Add WebM module 
Use already existing libraries: libvorbis and libopus. Also use newly
added libraries: libvpx, libwebm, libsimplewebm.
 2016-10-23 02:46:06 +02:00
Rémi Verschelde 24337f9c5e Merge pull request #6884 from vnen/html-export-char 
Fix extraneous NULL character on HTML export
 2016-10-22 13:09:54 +02:00
Rémi Verschelde 7740b3912c Merge pull request #6882 from vnen/mouse-mode 
Fix the hiding of mouse cursor before interaction
 2016-10-22 13:08:18 +02:00
Randy Tan Shaoxian 638a31d972 Fixed tiny error in detect.py causing compilation for Android to fail. 
(cherry picked from commit c9d7f77c6f)
 2016-10-22 13:04:13 +02:00
Rémi Verschelde ee6c5c5c23 Merge pull request #6858 from zaps166/gcc-color-output 
SCons: Use colored output if available, change "colored"->"verbose"
 2016-10-22 12:59:45 +02:00
George Marques 604ddd691c
Fix extraneous NULL character on HTML export 
Fix #2801
 2016-10-20 21:11:13 -02:00
eska fa219e02d7 Remove JavaScript compilation option compress. 
This functionality has been removed from Emscripten in version 1.36.13,
server-side compression is recommended instead.
 2016-10-21 00:02:44 +02:00
George Marques 414d58e6c0
Fix the hiding of mouse cursor before interaction 
Fix part of #6633
 2016-10-20 20:01:28 -02:00
Ariel Manzur 672225b710 added windows support for ipv6, cleaned up unix code 2016-10-20 07:04:10 -03:00
Rémi Verschelde c23e8797f1 Merge pull request #6855 from vnen/xaudio2-driver 
Isolate XAudio2 driver
 2016-10-18 07:22:10 +02:00
George Marques f3102160a1
Isolate XAudio2 driver 
Now it's possible to compile for Windows platform if wanted. It's
supported only for Windows 8 or later, so it's not enabled by default.
 2016-10-17 20:42:12 -02:00
Błażej Szczygieł 2bf4553fe0 SCons: Use colored output if available, change "colored"->"verbose" 2016-10-17 22:40:14 +02:00
Rémi Verschelde e96c49f849 Merge pull request #6850 from akien-mga/pr-scsub-shebang 
SCsub: Add python shebang as a hint for syntax highlighting
 2016-10-17 20:13:18 +02:00
Rémi Verschelde fc8ccd5b8c SCsub: Add python shebang as a hint for syntax highlighting 
Also switch existing shebangs to "better" /usr/bin/env python.
 2016-10-17 20:10:46 +02:00
Rémi Verschelde bdce7eefa0 Merge pull request #6846 from volzhs/android-dir-exists 
Fix crash when using Directory.dir_exists(path) on Android
 2016-10-17 10:10:25 +02:00
Rémi Verschelde 0eccf42884 Merge pull request #6723 from bvbfan/patch-1 
Correct OS architecture detection
 2016-10-17 09:48:26 +02:00
Błażej Szczygieł 4ffa8f224d Theora: Don't compile unnecessary files, rename "x86_opt_*" 2016-10-16 22:31:27 +02:00
volzhs 4a57821349 Fix crash when using Directory.dir_exists(path) on Android 2016-10-17 01:29:31 +09:00
Rémi Verschelde edbc0c0d0b freetype: Make it a module and split thirdparty library 
Comment out the weird workaround for building on Windows at it might
not be needed anymore. Testing needed to confirm.
 2016-10-15 18:10:17 +02:00
Rémi Verschelde cbf52606f4 zlib: Split thirdparty files, simplify scons option 2016-10-15 12:20:47 +02:00
Rémi Verschelde 36738ddda4 glew: Split thirdparty files and isolate env 
Not fully happy about the way this one interacts with the various
platforms. Maybe the platform_config.h should be generated by the
SCsub instead of passing a define just to know where is the header.
 2016-10-15 12:01:28 +02:00
Rémi Verschelde 8311a78df5 squish: Move to a module and split thirdparty lib 2016-10-15 12:01:28 +02:00
Rémi Verschelde 5c12c9e69b mpc: Move to a module and split thirdparty libmpcdec 2016-10-15 11:50:42 +02:00
Rémi Verschelde cfcc8a20e8 theora: Move to a module and split thirdparty lib 
Same rationale as the previous commits.
 2016-10-15 11:50:41 +02:00
Rémi Verschelde 422196759f openssl: Move to a module and split thirdparty lib 
Same rationale as the previous commits.
 2016-10-15 11:50:41 +02:00
Rémi Verschelde d9a291f641 ogg/vorbis/opus: Make them modules and unbundle thirdparty libs 
Took the opportunity to undo the Godot changed made to the
opus source. The opus module should eventually be built in its
own environment to avoid polluting others with too many include
dirs and defines.

TODO: Fix the platform/ stuff for opus.
 2016-10-15 11:50:40 +02:00
Rémi Verschelde ee3cf211c6 webp: Make it a module and unbundle libwebp thirdparty files 
Note that there are two Godot-specific changes made to libwebp
for the javascript/HTML5 platform. They are documented in the
README.md.
 2016-10-15 11:50:39 +02:00
Rémi Verschelde c31ad71f10 enet: Split enet thirdparty files and allow unbundling 
Building against shared libraries only implemented for Linux X11 so far.
TODO: Document Godot's modifications of upstream enet.
 2016-10-15 11:50:39 +02:00
Rémi Verschelde 5fef84a135 png: Split library to thirdparty dir and allow unbundling 
Uses the new structure agreed upon in #6157, but the thirdparty/ folder
does not behave following a logic similar to that of modules/ yet.

The png driver can't be moved to a module as discussed in #6157, as it's
required by core together with a few other ImageLoader implementations
(see drivers/register_driver_types.cpp:register_core_driver_types())

Dropped the possibility to disable PNG support, it's a core component
of Godot.
 2016-10-15 11:50:39 +02:00
Rémi Verschelde f63bf12193 Drop nedmalloc which is apparently not used anymore 2016-10-14 18:21:23 +02:00
Rémi Verschelde d3d0507c05 Remove speex support, it is obsoleted by opus 
As mentioned by upstream, Xiph.Org [0]:
> The Speex codec has been obsoleted by Opus. It will continue to be
> available, but since Opus is better than Speex in all aspects,
> users are encouraged to switch.

[0] http://www.speex.org/
 2016-10-13 18:58:56 +02:00
Anthony Fieroni f87e32696d Correct OS architecture detection 
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
 2016-10-11 20:58:24 +03:00
Juan Linietsky 1527cf8c0d 2D Shaders are working again using the new syntax, though all is buggy in general 2016-10-10 18:31:01 -03:00
Rémi Verschelde 93127070a6 Merge pull request #6704 from RandomShaper/fix-android-build-flags 
Fix compile flags not getting to the Android build
 2016-10-09 14:34:40 +02:00
Pedro J. Estébanez 7f51bb7b1c Fix compile flags not getting to the Android build 2016-10-04 16:55:29 +02:00
Juan Linietsky 22d83bc9f6 Begining of GLES3 renderer: 
-Most 2D drawing is implemented
-Missing shaders
-Missing all 3D
-Editor needs to be set on update always to be used, otherwise it does not refresh
-Large parts of editor not working
 2016-10-03 21:35:16 +02:00
Rémi Verschelde 9fce85f9d7 Merge pull request #6501 from SuperUserNameMan/windows_compile_with_standalone_msvc 
scons detects standalone MSVC on Windows
 2016-10-03 11:36:44 +02:00
Rémi Verschelde 90f4e76a46 Merge pull request #6479 from RandomShaper/improve-debug-focus 
Improve debug focus behavior
 2016-10-03 11:36:01 +02:00
Marc Gilleron 0c09de3ef1 Windows: prevent huge prints from crashing the engine 2016-09-29 03:15:12 +02:00
syskrank af4b0db1e4 removed confusing "if(true)" statement with empty "else" block 2016-09-26 12:30:59 +03:00
romeojulietthotel 94d6757a0d Use pkgconfig to locate ALSA libs (#6119) 
* This allows building when ALSA libs are in a non-standard location. PKG_CONFIG_PATH alone is not enough as the final link fails. Adding this makes the final link succeed.

* The extra LIBS flag for alsa is not needed so removing.
 2016-09-23 07:38:57 +02:00
Rémi Verschelde 2af6b3dd1b Merge pull request #6574 from RandomShaper/fix-android-export 
Fix manifest generation bug in Android export
 2016-09-23 07:28:04 +02:00
Andreas Haas 6fcf2b2bd8
x11: Fix event.is_action() for release of modifier keys 
The bug was that the release events for these also had the modifier state set, so the event comparison
failed.

Fixes #5901
 2016-09-22 12:24:44 +02:00
Pedro J. Estébanez 2c9d98bb48 Fix manifest generation bug in Android export 2016-09-21 12:46:40 +02:00
George Marques 5c21d49caf
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.
 2016-09-20 20:02:58 -03:00
yg2f 663d4ee7de scons detects standalone MSVC on Windows 
Under Windows, Scons is now capable of detecting and compiling with
standalone MSVC compilers (aka "Visual C++ Build Tools").
http://landinghub.visualstudio.com/visual-cpp-build-tools

Tried with version 2015, and native x86 and x64 compilers under
Windows 10 pro 64 and Windows 8.1 64, with the default Win8 SDK
provided by the "Visual C++ Build Tools" web-installer.

Follow the same compiling instructions than for compiling with Visual
Studio, except that Visual Studio is no more required.

KNOWN ISSUES :
- ``methods.detect_visual_c_compiler_version()`` will emit a warning message
on computers where the ``VSINSTALLDIR`` environement variable is not present.
But it should compile just fine and still automatically detects the 32 or
64 bits according to the compiler you picked.

TODO :
- eventually, update ``platform/winrt/dectet.py`` with function
``methods.msvc_is_detected()`` and try to compile winrt/UWP with
these standalone compilers (if you did not select Win10 SDK when
installing the standalone tools, you can run it again).
- update doc to make users aware of "Visual C++ Build Tools" aka
"stadalone MSVC".
- eventually, update ``methods.detect_visual_c_compiler_version()``
 2016-09-16 11:17:57 +02:00
Pedro J. Estébanez 66dac878ac Improve debug focus behavior 
Fix focusing debugged game on Windows
Add re-focusing editor on continue
 2016-09-14 04:02:18 +02:00
George Marques 291e985882
Fix UWP gamepad 2016-09-12 23:41:34 -03:00
George Marques e6ef92d217
Fix build error in WinRT export 2016-09-10 20:21:46 -03:00
Juan Linietsky 1f7fde299d Revert "Change Android float ABI to hard" 2016-09-10 12:31:01 -03:00
Juan Linietsky fc61eb37ce Merge pull request #5920 from 29jm/fix-warnings 
Fix some more warnings
 2016-09-10 12:21:02 -03:00
Juan Linietsky 7a27d5d9e7 Merge pull request #6363 from vnen/winrt 
Fix the support for WinRT/UWP
 2016-09-10 11:47:42 -03:00
Juan Linietsky 0a9c08f87c Merge pull request #6438 from RandomShaper/android-hard-float-abi 
Change Android float ABI to hard
 2016-09-10 11:40:44 -03:00
Pedro J. Estébanez 68cd19a6c2 Change Android float ABI to hard 2016-09-09 13:31:35 +02:00
Rémi Verschelde 233a991517 Merge pull request #6409 from Hinsbart/osx_gamepad 
osx: Support gamepad input.
 2016-09-08 07:48:18 +02:00
Rémi Verschelde 632d2477f6 Merge pull request #6415 from RandomShaper/fix-android-build 
Fix Android build (#5645)
 2016-09-07 20:42:09 +02:00
Pedro J. Estébanez e9065632c6 Fix (potentially) Android libs packaging issue (#5645) 2016-09-07 02:41:16 +02:00
George Marques 15458c8e6a
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.
 2016-09-06 13:09:45 -03:00
Andreas Haas 8c886b9d7a
osx: Support gamepad input. 
Fixes #3881

Vibration support is not optimal yet as it doesn't try to emulate the "weak" and "strong" motor strength,
but just takes the parameter with the highest value for the vibration gain.
 2016-09-06 00:47:54 +02:00
Rémi Verschelde 3efe1231f0 Move templates and distribution stuff to tools/dist 
Also removed the obsolete iOS xcode template.
 2016-09-05 07:49:10 +02:00
George Marques c1dfbb7628
Remove embedded ANGLE headers 
There's now a dependency on external ANGLE code, those are not needed
anymore.
 2016-09-03 19:29:52 -03:00
George Marques e21702f764
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.
 2016-09-03 19:28:49 -03:00
Rémi Verschelde c826ae1566 Merge pull request #6321 from hurikhan/fix_windows_mousemode 
Windows: Hide the mouse cursor when MOUSE_MODE_CAPTURED is activated.
 2016-08-31 08:04:07 +02:00
Rémi Verschelde 5efe47fb0b Merge pull request #4376 from eska014/js-eval 
Add JavaScript eval interface to web export
 2016-08-30 14:52:35 +02:00
Rémi Verschelde ecaa8844ca Merge pull request #6116 from Hinsbart/xrandr_so 
x11: Use proper sonames for loading libXrandr.
 2016-08-29 19:04:13 +02:00
Mario Schlack f0b6a242cc Hide the mouse cursor when MOUSE_MODE_CAPTURED is activated. 2016-08-29 13:14:38 +08:00
Juan Linietsky 6efbe9342a fix to mingw build 2016-08-20 01:55:53 -03:00
Juan Linietsky 38338e90c0 ENet windows compilation fixes. 
For reference, when you include a Windows header (be it directly windows.h or something that includes it)
put it at the end of the includes. it seems I forgot.
 2016-08-20 01:05:57 -03:00
Johan Manuel a4674bda47 Fix some comparisons between signed and unsigned integers 2016-08-13 13:21:35 +02:00
Johan Manuel 046f94d3ac Remove some unused variables 2016-08-13 13:21:35 +02:00
Andreas Haas f59860f464
x11: Use proper sonames for loading libXrandr. 2016-08-11 17:40:59 +02:00
marcelofg55 bf320fd4ea Crashfix for OSX on Sierra beta 2016-08-09 13:40:14 -03:00
Skyfrit 4f6a21b0df Android: Rename values-zh to values-zh-rCN (#6063) 2016-08-08 11:51:30 +02:00
Skyfrit 664b5b5137 Android: Add support for Traditional Chinese (HK) (#6061) 2016-08-08 11:49:51 +02:00
Skyfrit 8ab4acd17f Android: Add support for Traditional Chinese (TW) (#6061) 2016-08-08 11:49:35 +02:00
marcelofg55 38de4d24ef Fix set_window_size not setting the correct size on OSX 2016-08-02 22:30:19 -03:00
George Marques 0bc589a0c7
Fix Windows resource script 2016-07-27 15:35:49 -03:00
George Marques b48fd16add
Improve Windows application details 2016-07-27 12:37:12 -03:00
Rémi Verschelde fd659e869b Windows: Make alert message box use MB_TASKMODAL 
This flag pauses the current running thread, allowing for the user to see the
alert and acknowledge it before the thread continues (and e.g. crashes :)).

Thanks to @SuperUserNameMan for finding it.
Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/ms645505(v=vs.85).aspx
 2016-07-26 15:16:45 +02:00
Rémi Verschelde dc3c32b488 Merge pull request #5894 from vnen/windows-set-position 
Avoid changing position when the window is fullscreen
 2016-07-24 17:55:25 +02:00
Juan Linietsky 9213400cd5 Merge pull request #5415 from volzhs/improve-android-payment 
Improve android payment
 2016-07-24 12:18:13 -03:00
George Marques 7be70c5a3c
Avoid changing position when the window is fullscreen 2016-07-24 12:07:59 -03:00
Rémi Verschelde 82d18f4c1c Merge pull request #5845 from hurikhan/x11_cleanup 
Code cleanup in platform/x11
 2016-07-22 08:35:26 +02:00
Mario Schlack 503f9ab9d9 Code cleanup in platform/x11 2016-07-21 21:11:34 +02:00
Mario Schlack d04ada3973 Implement OS.request_attention() for X11 2016-07-21 19:40:36 +02:00
Rémi Verschelde b623acb718 Merge pull request #5841 from vnen/fix-windows-wheel 
Fix mouse wheel event position on Windows
 2016-07-21 17:31:24 +02:00
Rémi Verschelde 93de25f68a Merge pull request #5837 from hurikhan/android_cleanup 
Minor code formatting in platform/android
 2016-07-21 17:31:14 +02:00
GungnirInd 2c1a74fb3a Implement OS.request_attention() for OSX (#5662) 
Keeps bouncing icon until user focuses window
 2016-07-21 17:30:20 +02:00
Rémi Verschelde d723e5a62f Merge pull request #5560 from vnen/os-request-attention 
Add OS.request_attention() for Windows
 2016-07-21 17:29:45 +02:00
George Marques f4c0bc20c3
Fix mouse wheel event position on Windows 2016-07-21 12:14:25 -03:00
Mario Schlack beaa56bff2 Minor code formatting in platform/android 2016-07-21 12:07:01 +02:00
Rémi Verschelde b1cca17053 Merge pull request #5835 from volzhs/issue-5831 
Fix compile error if use android_stl=yes
 2016-07-21 10:37:18 +02:00
volzhs 01e39ecec8 Fix compile error if use android_stl=yes 2016-07-21 17:31:46 +09:00
Rémi Verschelde 5274f2a126 Merge pull request #5819 from hurikhan/android_getScreenDPI 
Implement get_screen_dpi() on Android
 2016-07-21 09:09:49 +02:00
Mario Schlack 0717893772 Implement get_screen_dpi() on Android 2016-07-20 14:54:48 +02:00
Juan Linietsky 0988970c1f Fixed properly not save signals that already exist in their base scenes, closes #5656 2016-07-19 21:26:12 -03:00
Juan Linietsky 587826f879 remove GLU dependency, closes #3787 2016-07-18 17:25:03 -03:00
volzhs 79cb91dc84 Add querying details of IAP items for android 2016-07-18 23:45:58 +09:00
volzhs f26f181ba9 Fix can't get all info if user purchases many items and not consumed 2016-07-18 23:45:58 +09:00
Rémi Verschelde 8de5aedb9e Merge pull request #5718 from jay3d/master 
Added gyroscope support to Godot and Android
 2016-07-18 00:52:15 +02:00
Rémi Verschelde 523e46ad0a Revert "Make editor compatible with Windows high contrast themes" 
This reverts commit 85a5290ee8.

The patch itself is good and it could maybe be readded in the future,
but right now Microsoft forced its Windows 10 "update" on people with older
Intel HD Graphics 3000 IGP without ensuring that they can ship proper drivers,
and such users seem to get Godot crashing due to this patch. Sorry :(
Closes #5452.
 2016-07-18 00:24:21 +02:00
Jamil Halabi 370ae3512d Added gyroscope support to Godot and Android 2016-07-16 01:43:32 +08:00
Rémi Verschelde 26baaf447a WinRT: Add missing license file for ANGLE 
Also drop the unused "All rights reserved" FunctionDiscoveryKeys_devpkey.h
Fixes #4859.
 2016-07-14 08:49:02 +02:00
sanikoyes 978cb0e884 Fix crash in FileAccessJAndroid::file_exists (does not free local ref) 2016-07-11 12:41:54 +08:00
Juan Linietsky d279d060e1 Merge pull request #5077 from RandomShaper/improve-android-build 
Improve Android build
 2016-07-10 13:57:17 -03:00
Juan Linietsky e74d71a5bf Merge pull request #5574 from volzhs/android-app-id 
Add android_add_default_config for config.py
 2016-07-10 13:03:37 -03:00
Juan Linietsky 28641fd9b8 Merge pull request #5525 from SuperUserNameMan/window_get_latin_kb_variant 
windows get_latin_keyboard_variant() implementation and gdscript binding, #5503
 2016-07-10 12:41:05 -03:00
Juan Linietsky 864c0e84de line/col label was changing size with each cursor move, forcing the GUI to resize upwards and costing considerably CPU usage. 
It has been changed so it won't resize the UI when modified.
This will make the code editor feel a lot smoother.
 2016-07-09 14:56:08 -03:00
Rémi Verschelde 02aeac12d1 OSX export: Default to fat format, make it an enum 
Since we want to distribute only the fat binary in the official templates, this should
make it work out of the box. 32 bits and 64 bits options are still available for people
that want them, but will throw an error if the binaries are not in the template zip.
 2016-07-09 00:46:10 +02:00
eska 4beeff9433 Pass mouse position to Input singleton in web export 2016-07-08 20:09:25 +02:00
Juan Linietsky 7e3044981e Avoid crash if setting modifiers fails, closes #5158 2016-07-08 11:28:09 -03:00
Rémi Verschelde 3fcb9b1ec1 Removed unused variables (second pass) + dead code 
Fixes various gcc 5.4.0 warnings for -Wunused-variable and -Wunused-but-set-variable
 2016-07-07 23:15:59 +02:00
Rémi Verschelde b6ac91c0e6 Removed unused variables (first pass) 
Fixes various gcc 5.4.0 warnings for -Wunused-variable and -Wunused-but-set-variable
 2016-07-07 23:15:03 +02:00
volzhs 40d3234304 Add android_add_default_config for config.py 
usage : env.android_add_default_config("applicationId 'com.godot.game'")
 2016-07-07 04:03:50 +09:00
George Marques 5c355a63d3
Add OS.request_attention() for Windows 2016-07-05 12:29:08 -03:00
Rémi Verschelde 90b5b0d1c9 Merge pull request #5552 from volzhs/fix-jni-null 
Fix crash when null value through jni on android
 2016-07-04 23:39:31 +02:00
Rémi Verschelde 176920278f Merge pull request #5551 from eska014/bsd-no-libdl 
Link libdl only on Linux, fix BSD build
 2016-07-04 23:39:11 +02:00
volzhs b09dbaa78e Fix crash when null value through jni on android 2016-07-05 04:41:46 +09:00
eska a2386bd2b2 Link libdl only on Linux, fix BSD build 2016-07-04 18:39:27 +02:00
SuperUserNameMan 7a142780f0 windows get_latin_keyboard_variant() implementation and gdscript binding 2016-07-03 19:35:13 +02:00
Rémi Verschelde 6bd22b9c2e Merge pull request #5516 from Hinsbart/fix_win_freeze 
Windows: prevent freeze while moving or resizing the game window.
 2016-07-03 19:17:09 +02:00
Rémi Verschelde 9693f37fcc Merge pull request #5491 from volzhs/fix-jni-bool-string 
Fix wrong return bool, string, string array data through jni
 2016-07-03 19:11:04 +02:00
Juan Linietsky 1726bacf78 missnig ; 2016-07-02 16:04:00 -03:00
Juan Linietsky 973a12c5f2 Data dir returns a symlink in Android 6.0, which confuses DirAccess on android, this should fix it 2016-07-02 11:49:52 -03:00
Andreas Haas 6856c52491 Windows: prevent freeze while moving or resizing the game window. 
When moving or resizing the window, Windows spins up a seperate event-loop, effectively blocking the normal one.
To work around this, we're starting a timer that will continue sending WM_TIMER messages which we can use to keep the mainloop running.

fixes #4695
 2016-07-01 16:55:53 +02:00
eska 913361928f Add JavaScript eval interface 2016-06-30 15:45:40 +02:00
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