aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | thekla: Fix build on x86 systems without SSE supportRémi Verschelde2017-12-152-5/+17
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14709. Same as https://github.com/Thekla/thekla_atlas/pull/11, but adding comments until it's merged upstream.
* | | | | | | | | | | | | | | | | | | | Merge pull request #14580 from Krakean/string_split_new_argRémi Verschelde2017-12-154-6/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added third argument for String.split() function
| * | | | | | | | | | | | | | | | | | | | Added third argument for String.split() function (see issue #14349)Dmitry Koteroff2017-12-154-6/+22
| | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove negative limit, leave only positive and make it reflect behaviour like in Python Also limit renamed to maxsplit to match Python one. Also docs updated. Fix indent
* | | | | | | | | | | | | | | | | | | | ScriptCreateDialog: Fix loading scripts with named classes.Andreas Haas2017-12-151-1/+1
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only need to validate the class name when creating a new script, existing scripts already have one. Fixes #14643 Supersedes/Closes #14684
* | | | | | | | | | | | | | | | | | | Merge pull request #14673 from Silvea12/masterAndreas Haas2017-12-151-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | Updated input_default.cpp again (new input maps take priority)
| * | | | | | | | | | | | | | | | | | Updated input_default.cpp again (new maps take priority)Andrew Silver2017-12-141-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14639
* | | | | | | | | | | | | | | | | | | Merge pull request #14656 from apezel/masterRémi Verschelde2017-12-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes built-In "LIGHT" causing fragment compilation error
| * | | | | | | | | | | | | | | | | | | Fixes built-In "LIGHT" causing fragment compilation errorArnaud PEZEL2017-12-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a rename for shader LIGHT built-in, Fix bug #14537
* | | | | | | | | | | | | | | | | | | | Merge pull request #14703 from Faless/fix_http_clientRémi Verschelde2017-12-152-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix javascript build error and improve #14604
| * | | | | | | | | | | | | | | | | | | | Fix javascript build error and improve #14604Fabio Alessandrelli2017-12-152-5/+5
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #14694 from Calinou/update-hack-fontRémi Verschelde2017-12-153-41/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Hack font to version 3.000
| * | | | | | | | | | | | | | | | | | | | | Update Hack font to version 3.000Hugo Locurcio2017-12-153-41/+22
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #14666 from henriquelalves/slider_issueRémi Verschelde2017-12-151-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | Fix slider ticks offset
| * | | | | | | | | | | | | | | | | | | | | Fixes slider node tick offsetHenrique L Alves2017-12-151-4/+4
| | |_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes wrong tick offset on slider nodes - they now match with the corresponding 'grabber' positions. Fixes issue #14637
* | | | | | | | | | | | | | | | | | | | | fix compile issueJuan Linietsky2017-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | -Added new scene conversion to binary on export (disabled by default, please ↵Juan Linietsky2017-12-157-250/+670
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test) -This method works by directly converting text to binary, so the scene does not need to be loaded and saved
* | | | | | | | | | | | | | | | | | | | | Merge pull request #14646 from willnationsdev/docs4Noshyaar2017-12-154-14/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] Animation, CanvasItem, Curve3D, Curve
| * | | | | | | | | | | | | | | | | | | | | [DOCS] Animation, CanvasItem, Curve3D, CurveWill Nations2017-12-134-14/+48
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #14678 from NathanWarden/navigation_docNoshyaar2017-12-151-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] Completed the docs for the Navigation node.
| * | | | | | | | | | | | | | | | | | | | | [DOCS] Completed the docs for the Navigation node.Nathan Warden2017-12-151-0/+11
| | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #14679 from ↵Thomas Herzog2017-12-151-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | touilleMan/add-godot_get_global_constants-to-gdnative-wrapper [GDnative] missing godot_get_stack_bottom and godot_get_global_constants
| * | | | | | | | | | | | | | | | | | | | Add missing godot_get_stack_bottom and godot_get_global_constants in ↵Emmanuel Leblond2017-12-151-0/+12
| |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gdnative_api.json
* | | | | | | | | | | | | | | | | | | | Merge pull request #14690 from bruvzg/thekla-mingw-build-fixRémi Verschelde2017-12-154-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes thekla atlas mingw-w64 build.
| * | | | | | | | | | | | | | | | | | | | Fixes thekla atlas mingw-w64 buildbruvzg2017-12-154-2/+11
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Remove debug printf on WindowsRémi Verschelde2017-12-151-2/+0
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #14604 from mhilbrunner/http-defaultsRémi Verschelde2017-12-155-132/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | HTTP cleanup & better defaults
| * | | | | | | | | | | | | | | | | | | HTTP cleanup & better defaultsmhilbrunner2017-12-145-132/+131
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #14672 from akien-mga/openmp-linkingRémi Verschelde2017-12-141-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | openmp: Simplify linking on X11, fixing clang build
| * | | | | | | | | | | | | | | | | | | openmp: Simplify linking on X11, fixing clang buildRémi Verschelde2017-12-141-2/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #14674 from djrm/pr_visual_improvementsRémi Verschelde2017-12-1424-232/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Updated icons
| * | | | | | | | | | | | | | | | | | | Updated iconsDaniel J. Ramirez2017-12-1424-232/+48
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ciskip]
* | | | | | | | | | | | | | | | | | | Merge pull request #14667 from bruvzg/macports-clang-impRémi Verschelde2017-12-143-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor improvements for #14658 (MacPorts clang support)
| * | | | | | | | | | | | | | | | | | | MacPorts clang version selection, and OpenMP linking fix.bruvzg2017-12-143-12/+13
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | GDScript files are converted to binary on export now.Juan Linietsky2017-12-145-20/+102
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Fix type mismatch in OS::set_borderless_windowRémi Verschelde2017-12-147-8/+7
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14663.
* | | | | | | | | | | | | | | | | | Merge pull request #14662 from akien-mga/openmp-clangRémi Verschelde2017-12-142-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | openmp: Don't try to link GCC's implementation on Clang
| * | | | | | | | | | | | | | | | | openmp: Don't try to link GCC's implementation on ClangRémi Verschelde2017-12-142-8/+9
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also disable openmp build on Travis, breaks on Trusty's Clang. Group deps more naturally.
* | | | | | | | | | | | | | | | | Merge pull request #14657 from Valentactive/fix_compiling_new_lightmapperRémi Verschelde2017-12-142-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for compiling the new lightmapper
| * | | | | | | | | | | | | | | | | fix for compiling the new lightmapperMichele Valente2017-12-142-4/+4
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also changed two calls that were ambiguous
* | | | | | | | | | | | | | | | | Merge pull request #14658 from bruvzg/macports-clangRémi Verschelde2017-12-145-3/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `macports_clang` build flag.
| * | | | | | | | | | | | | | | | | Adds `macports_clang` build flag to build using clang-5.0 form MacPorts ↵bruvzg2017-12-145-3/+25
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (with OpenMP support).
* | | | | | | | | | | | | | | | | Merge pull request #14654 from ColinKinloch/masterRémi Verschelde2017-12-143-7/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Fixed inconsistent use of tabs and spaces in indentation.
| * | | | | | | | | | | | | | | | Added indent_style to editorconfig, fixed inconsistent use of tabs and ↵Colin Kinloch2017-12-143-7/+11
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spaces in indentation.
* | | | / / / / / / / / / / / / -Add lightmapperJuan Linietsky2017-12-1444-1138/+4584
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Fixes to unwrapper (remove degenerates), makes Thekla not crash -Added optional cancel button in EditorProgress -Added function to force processing of events (needed for cancel button)
* | | | | | | | | | | | | | | Revert property changes in "[DOCS] AnimationPlayer new props, members/methods"Rémi Verschelde2017-12-144-51/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This partially reverts commits e79456519d0c1dff98ffa5f39e8e7c962b7dd553 and 2d07fe29208b9ccef31ab654ca5405edac7a0de7, which introduced API changes needing more in-depth review at this stage. Kept the removal of "get_position" binding, redundant with "get_current_animation_position". Kept docs changes where applicable. Also removed the obsolete "stop_all" method which does the same as "stop". Fixes #14602.
* | | | | | | | | | | | | | | Merge pull request #14638 from mhilbrunner/patch-7Rémi Verschelde2017-12-132-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] JSON: Small fixes
| * | | | | | | | | | | | | | | [DOCS] JSON: Small fixesMax Hilbrunner2017-12-132-6/+6
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #14633 from poke1024/fix-richtextlabel-crashRémi Verschelde2017-12-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | Fix crash (and bug) in RichTextLabel
| * | | | | | | | | | | | | | Fix crash (and bug) in RichTextLabelpoke10242017-12-131-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #14626 from Hinsbart/module_envRémi Verschelde2017-12-134-6/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scons: Build modules in seperate env.