Commit Graph

6187 Commits

Author SHA1 Message Date
Rémi Verschelde 22e1512638 openssl: Reapply necessary WinRT changes from patch
(cherry picked from commit 996f1ae29e)
2017-06-17 11:51:28 +02:00
Rémi Verschelde b5d200898e openssl: Define WIN32_LEAN_AND_MEAN on Windows
This avoids namespace collisions with things such as X509_NAME.
Also force include of necessary definitions in `crypto/o_str.c`
which seem missing on MSVC (but work on MinGW).

(cherry picked from commit c1b0662b40)
2017-06-17 11:51:28 +02:00
Rémi Verschelde c2e022c7c9 openssl: Sync with pristine upstream 1.0.2h
Our necessary custom changes will be reapplied in later commits for clarity,
and saved as patches for future updates.

(cherry picked from commit cb0f771aaa)
2017-06-17 11:51:28 +02:00
Rémi Verschelde 8301137b38 openssl: Document update process and delete unused files
(cherry picked from commit 022541d917)
2017-06-17 11:51:28 +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
William Tumeo a82bf83ea2 Add advanced string format
Cherry-pick from #7010
2017-06-16 00:41:51 -03:00
Rémi Verschelde 90a07122c2 Merge pull request #9197 from vnen/fix-wheel-pos
Fix MouseWheel position on Windows
2017-06-15 18:24:48 +02:00
George Marques 7174d706aa
Fix MouseWheel position on Windows 2017-06-15 13:18:58 -03:00
Rémi Verschelde 734045667d Merge pull request #9100 from RandomShaper/optimize-2d-lighting-2.1
Add optimizing AT_LIGHT_PASS builtin to canvas shaders (2.1)
2017-06-15 15:12:43 +02:00
Rémi Verschelde 8536d21931 Merge pull request #9101 from RandomShaper/filtered-texscreen-2.1
Add option for filtered texscreen (2.1)
2017-06-15 13:35:33 +02:00
Rémi Verschelde 89621fee5d Merge pull request #9178 from RandomShaper/fix-touchbutton-2.1
Fix/improve TouchScreenButton (2.1)
2017-06-15 12:39:04 +02:00
Pedro J. Estébanez 184ef18420 Add optimizing AT_LIGHT_PASS builtin to canvas shaders
This one allows for complex shaders paired with a simple lighting shader to skip code that would otherwise be pointlessly (and wastefully) run during the light pass.
You can use `if (AT_LIGHT_PASS) , negated or not, and that will be converted to a preprocessed #if when the shader is compiled.
Depending on your game (number of items and lights), this can be a *significant* performance gain, or at least avoids relying on the driver's optimizing abilities.
2017-06-15 02:03:25 +02:00
Pedro J. Estébanez 693ebbb807 Fix/improve TouchScreenButton
- Refactor touch acceptance logic so the same is used whether passby is enabled or not.
- Remove the check for visibility during input handling as it should never fail; instead using now an ERR_FAIL_COND() just in case since we have been checking for that so far.

Fixes #9159.
2017-06-14 17:13:58 +02:00
Rémi Verschelde a514518aa8 Merge pull request #9172 from StraToN/signals-description
[2.1] Add Signals descriptions when they exist.

[ci skip]
2017-06-14 16:13:07 +02:00
Julian Murgia e15162ccc3 Add Signals descriptions when they exist 2017-06-14 15:55:27 +02:00
dumitru.stama 95dcd22b46 Added a new 'blend_rect' method acting as 'blit_rect' with alpha-blending 2017-06-14 00:55:52 -07:00
Rémi Verschelde dc420b3b0a Doc: Sync classref with current source 2017-06-14 09:26:43 +02:00
Andreas Haas 6ae8cbb850
EditorSettings: Default game window placement to Centered. 2017-06-12 21:10:31 +02:00
Sean Bohan 1028739690 Subtract body position from shape offset during tileset convert
To be able to adjust tile offset by changing position of StaticBody instead of modifying it maunally from the tres file or by calling a script.
2017-06-11 11:58:02 +08:00
Rémi Verschelde fe78ebbcb4 Merge pull request #8920 from pixelpicosean/scroll-to-pan-canvas-item-editor
Add settings to pan canvas editor instead of zoom with mouse/touchpad scrolling
2017-06-09 10:49:25 +02:00
Pedro J. Estébanez 14e30c3faa Remove mutex-locking from non-debug memory routines
since the malloc() suite is nowadays thread-safe by itself (from MSVC 2010 you don't even have a non-MT runtime and for POSIX-based OSs it's mandatory by the spec.

Bonus: Clear about-to-be-released blocks with a better magic number for better debugging of dangling pointers.
2017-06-08 20:37:43 +02:00
Pedro J. Estébanez 8e4c60756a Add option for filtered texscreen 2017-06-08 20:19:04 +02:00
Rémi Verschelde a23d321445 Merge pull request #9088 from vnen/uwp-2.1
[2.1] Add WinRT support
2017-06-07 22:02:24 +02: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 1cb77c3684
Patch thirdy-party libraries to build for WinRT
- Patch enet code.
- Patch OpenSSL code and add shims for unavailable API.
- Add extra definition header for Freetype.
2017-06-07 11:36:00 -03:00
George Marques c51f54749f
Fix drivers coding for WinRT
- Add a proper function to retrieve IP addresses.
- Solve issues with Windows FileAccess and DirAccess to use the same code
  for WinRT.
- Add patches to the GLES2 rasterizer to workaround ANGLE issues.
2017-06-07 11:36:00 -03:00
George Marques 1d759f02e6
Fix root path resolution on PCK file 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 7c3b3e0a80 Revert "Fix text warp in color blocks with CJK"
This reverts commit b93fce1c18.

That commit introduced regressions for non-CJK languages are discussed
in #8952. Fixes #9078.
2017-06-07 07:40:06 +02:00
Rémi Verschelde 5f98c16d59 Merge pull request #8964 from RandomShaper/fix-bc-2.1
Use builtin BC decompression when libsquish not available (2.1)
2017-05-29 08:10:16 +02:00
Pedro J. Estébanez bf4a25c272 Use builtin BC decompression when libsquish not available
Builtin code is revived and fixed.
2017-05-28 03:45:38 +02:00
Pedro J. Estébanez 499ef55cbc Improve/harmonize mobile builds 2017-05-27 23:26:47 +02:00
Rémi Verschelde 6fb97d9898 Merge pull request #8952 from GodotExplorer/pr-fix-richtextlabel-warp-CJK
[2.1] Fix text warp in color blocks with CJK
2017-05-27 11:34:31 +02:00
Rémi Verschelde 3ebf4d5b32 Merge pull request #8945 from tagcup/s3tc_stuff_2_1
Use libsquish to decompress DXT textures.
2017-05-27 11:33:23 +02:00
Rémi Verschelde fd1f712aeb Merge pull request #8941 from RandomShaper/warn-levels-2.1
Rework warning levels (2.1)
2017-05-27 11:30:19 +02: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 7b286b06da Merge pull request #8919 from pixelpicosean/fix-item-list-scroll
[2.1] Fix item list scroll speed
2017-05-27 11:20:47 +02:00
Rémi Verschelde 680b905ae4 Merge pull request #8918 from GodotExplorer/pr-expose-texturebutton-resize-model-consts
Expose texturebutton resize model constants
2017-05-27 11:19:24 +02:00
Geequlim cd778e00dc Fix text warp in color blocks with CJK 2017-05-27 14:07:18 +08:00
Pedro J. Estébanez 49669c9b42 Rework warning levels
Now you have: extra, all (the default), moderate, no.
The old 'yes' option is still supported, but a warning will be printed and 'all' will be assumed.

The different options will translate to the following:

MSVC:
extra -> /Wall (implies /W4)
all -> /W3 + disable non-essential (*)
moderate -> /W2 + disable non-essential (*)
no -> /w

GCC/Clang:
extra -> -Wall -Wextra
all -> -Wall
moderate -> -Wall -Wno-unused
no -> -w

* = Truncations, narrowing conversions...: /wd4267 /wd4244 /wd4305 /wd4800
2017-05-27 02:31:05 +02:00
Ferenc Arn aef3c4a804 Use libsquish to decompress DXT textures.
Also ensure that save_png doesn't modify the image.

Removed the broken decompressor in the process.
2017-05-26 18:56:10 -05: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
Bojidar Marinov 831cb5b119 Fix weigth scale of A* being applied to the whole path and estimation
Attempt to fix #8584

(cherry picked from commit bd91730347)
2017-05-27 00:42:59 +02:00
Ferenc Arn 89703435a1 Avoid overestimating the cost in AStar heuristics.
This is a necessary condition for finding optimal solutions.
This is achieved by simply requiring/ensuring that no weights are smaller than 1.

Fixes #8584.

(cherry picked from commit e4eb093c62)
2017-05-27 00:42:59 +02:00
Rémi Verschelde 405b113a18 Add recent contributors to AUTHORS
(cherry picked from commit afda71a2a6)
2017-05-27 00:42:59 +02:00
Fabian Mathews f0beb36652 Added bool to allow astar points to be connected in one direction only
(cherry picked from commit 2262a59ab3)
2017-05-27 00:42:59 +02:00