aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed compiling on windows after .hdr supportzer0problem2017-05-311-1/+1
| | | | Changed type to avoid casting.
* Merge pull request #8986 from Hinsbart/cursor_warningRémi Verschelde2017-05-291-1/+3
|\ | | | | X11: Turn warning about not finding cursor theme into verbose output.
| * X11: Turn warning about not finding cursor theme into verbose output.Andreas Haas2017-05-291-1/+3
|/ | | | | | Failing to get the cursor theme should not cause any issues since we're then using the default one anyway. So I removed the warning and made it a verbose-only print instead, as people tend to mistake it for a real error.. (pretty much like `iCCP: known incorrect sRGB profile` :P)
* Merge pull request #8978 from noshyaar/pr-sortRémi Verschelde2017-05-291-0/+12
|\ | | | | NaturalSort: strings start with . treated differently
| * NaturalSort: strings start with . treated differentlyPoommetee Ketson2017-05-291-0/+12
| |
* | Fixed a typo in a Visual Server var name (#8977)suptoasty2017-05-292-5/+5
|/
* -Added .hdr format supportJuan Linietsky2017-05-2834-292/+1222
| | | | | | -Added default environment editor setting -Added environment created by default in new projects -Removed default light and ambient from spatial editor, to make the editor more PBR compliant
* Merge pull request #8975 from timoschwarzer/new-iconsRémi Verschelde2017-05-289-0/+0
|\ | | | | Use new icons everywhere
| * Use new icons everywhereTimo Schwarzer2017-05-289-0/+0
| | | | | | | | Closes #8879
* | Remove obsolete signal_renames fileRémi Verschelde2017-05-281-21/+0
| |
* | opus: Update to upstream version 1.1.5Rémi Verschelde2017-05-2840-250/+425
|/
* Merge pull request #8972 from Kristonitas/masterRémi Verschelde2017-05-281-1/+1
|\ | | | | Fixing typo for rect_position in _change_notify call for Control
| * Fixing typo for rect_position in _change_notify call for ControlKristupas Stumbrys2017-05-281-1/+1
| |
* | Merge pull request #8966 from voithos/path2d-bezier-handle-fixRémi Verschelde2017-05-281-9/+7
|\ \ | | | | | | Fix moving path controls in edit mode.
| * | Fix moving path controls in edit mode.Zaven Muradyan2017-05-271-9/+7
| | | | | | | | | | | | | | | | | | The previous code would never trigger the subsequent conditionals (for moving the control points) when in EDIT_MODE because the point conditionals were nested instead of being a conjunction.
* | | Merge pull request #8968 from noshyaar/pr-bug2Rémi Verschelde2017-05-281-0/+2
|\ \ \ | | | | | | | | CreateDialog: fix activating recent item creates node selected in search result
| * | | CreateDialog: fix activating recent item creates node selected in search resultPoommetee Ketson2017-05-281-0/+2
| |/ /
* | | Merge pull request #8967 from noshyaar/pr-bugRémi Verschelde2017-05-281-1/+1
|\ \ \ | |/ / |/| | CreateDialog: select root if search exactly match
| * | CreateDialog: select root if search exactly matchPoommetee Ketson2017-05-281-1/+1
|/ /
* | Merge pull request #8960 from akien-mga/openssl-1.0.2lRémi Verschelde2017-05-27241-9038/+3244
|\ \ | |/ |/| OpenSSL: Cleanup and document update process from upstream sources + 1.0.2l
| * openssl: Sync with upstream 1.0.2lRémi Verschelde2017-05-27208-1706/+3121
| |
| * openssl: Reapply necessary UWP changes from patchRémi Verschelde2017-05-274-19/+28
| |
| * openssl: Define WIN32_LEAN_AND_MEAN on WindowsRémi Verschelde2017-05-273-0/+66
| | | | | | | | | | | | 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).
| * openssl: Sync with pristine upstream 1.0.2hRémi Verschelde2017-05-276-106/+11
| | | | | | | | | | Our necessary custom changes will be reapplied in later commits for clarity, and saved as patches for future updates.
| * openssl: Document update process and delete unused filesRémi Verschelde2017-05-2726-7213/+24
|/
* TinyEXR: Document licensing and copyrightRémi Verschelde2017-05-272-0/+20
|
* Fix MinGW-w64 build of TinyEXR for old toolchainsRémi Verschelde2017-05-271-7/+33
| | | | | MinGW-w64 is at version 2.0.1 on our current Travis CI toolchain, and seems not to like fopen_s.
* Fix text warp in color blocks with CJKGeequlim2017-05-271-1/+1
| | | | (cherry picked from commit cd778e00dc5362d00d4760c79fc301951f6f9b75)
* Fix item list scroll speed.Sean Bohan2017-05-271-4/+0
| | | | | | Remove the extra `set_val` action after the proper one, so the right scroll value won’t get overrided any more. (cherry picked from commit 064dce7a4c4bdca13b5358ccc9f9829f0e1068fb)
* Merge pull request #8956 from mcanders/mcanders/ProfilerInputFixRémi Verschelde2017-05-271-1/+1
|\ | | | | Fix incorrect input event reference in editor_profiler.cpp
| * Fix incorrect input event reference in editor_profiler.cppCarter Anderson2017-05-271-1/+1
| |
* | Merge pull request #8955 from mcanders/mcanders/AnimationEditorInputFixRémi Verschelde2017-05-271-7/+7
|\ \ | | | | | | Fix incorrect input event reference in animation_editor.cpp
| * | Fix incorrect input event reference in animation_editor.cppCarter Anderson2017-05-271-7/+7
| |/
* | Merge pull request #8933 from Hinsbart/is_keywordRémi Verschelde2017-05-277-8/+12
|\ \ | | | | | | GDScript: Use "is" keyword for type checking.
| * | GDScript: Use "is" keyword for type checking.Andreas Haas2017-05-277-8/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the `extends` keyword with `is` in the context of testing for type compatibility. `extends` is still used for declaring class inheritance. Example: ```gdscript extends Node2D func _input(ev): if ev is InputEventKey: print("yay, key event") ```
* | Merge pull request #8942 from RandomShaper/warn-levelsRémi Verschelde2017-05-271-10/+22
|\ \ | | | | | | Rework warning levels
| * | Rework warning levelsPedro J. Estébanez2017-05-271-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #8936 from Hinsbart/fix_actionRémi Verschelde2017-05-272-3/+3
|\ \ \ | | | | | | | | Fix InputEvent actions.
| * | | Fix InputEvent actions.Andreas Haas2017-05-272-3/+3
| | | | | | | | | | | | | | | | | | | | The `InputEvent::is_action(pressed|released)` methods weren't implemented yet. Also fixed a typo in `InputDefault` that prevented `Input.is_action(pressed|released)` from working.
* | | | Merge pull request #8935 from volzhs/get-locale-masterRémi Verschelde2017-05-272-4/+3
|\ \ \ \ | | | | | | | | | | Make OS.get_locale() returns same value
| * | | | Make OS.get_locale() returns same valuevolzhs2017-05-272-4/+3
| | | | |
* | | | | Merge pull request #8929 from nunodonato/themecolorsRémi Verschelde2017-05-272-3/+29
|\ \ \ \ \ | | | | | | | | | | | | Added color presets for easy theme switching
| * | | | | Added color presets for easy theme switchingNuno Donato2017-05-262-3/+29
| |/ / / / | | | | | | | | | | | | | | | Also tweaked the default colors (darker and less satured)
* | | | | Merge pull request #8928 from nunodonato/helpmenuRémi Verschelde2017-05-275-11/+57
|\ \ \ \ \ | |_|_|_|/ |/| | | | Added an help menu
| * | | | Added an help menuNuno Donato2017-05-265-11/+57
| |/ / / | | | | | | | | | | | | | | | | Also renamed the "tutorials" button in the script editor to be consistent with the help menu entry. Fixed #8921
* | | | -Added EXR supprot for HDR (no BC6 compression yet though)Juan Linietsky2017-05-2618-109/+13359
| | | | | | | | | | | | | | | | | | | | | | | | -Improvements to texture importer -Proper detection of S3TC compression modes, and added all modes to Image -Fixes to non-power of 2 compressed textures, which should all be supported by GLES3
* | | | Merge pull request #8939 from RandomShaper/ccflags-iphoneRémi Verschelde2017-05-271-4/+4
|\ \ \ \ | |_|/ / |/| | | Allow custom CCFLAGS for iPhone builds
| * | | Allow custom CCFLAGS for iPhone buildsPedro J. Estébanez2017-05-271-4/+4
|/ / / | | | | | | | | | plus disable exceptions by default
* | | Merge pull request #8916 from sanikoyes/Pr-fix_audio_stoped_iOSRémi Verschelde2017-05-262-0/+10
|\ \ \ | | | | | | | | Fix audio can't resume in iOS platform
| * | | Fixed audio can not resume if it is interrupted cause by an incoming phone callsanikoyes2017-05-262-0/+10
| |/ /