summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-15Merge pull request #14666 from henriquelalves/slider_issueRémi Verschelde
Fix slider ticks offset
2017-12-15fix compile issueJuan Linietsky
2017-12-15Fixes slider node tick offsetHenrique L Alves
Fixes wrong tick offset on slider nodes - they now match with the corresponding 'grabber' positions. Fixes issue #14637
2017-12-15-Added new scene conversion to binary on export (disabled by default, please ↵Juan Linietsky
test) -This method works by directly converting text to binary, so the scene does not need to be loaded and saved
2017-12-15Merge pull request #14646 from willnationsdev/docs4Noshyaar
[DOCS] Animation, CanvasItem, Curve3D, Curve
2017-12-15Merge pull request #14678 from NathanWarden/navigation_docNoshyaar
[DOCS] Completed the docs for the Navigation node.
2017-12-15Merge pull request #14679 from ↵Thomas Herzog
touilleMan/add-godot_get_global_constants-to-gdnative-wrapper [GDnative] missing godot_get_stack_bottom and godot_get_global_constants
2017-12-15Merge pull request #14690 from bruvzg/thekla-mingw-build-fixRémi Verschelde
Fixes thekla atlas mingw-w64 build.
2017-12-15Fixes thekla atlas mingw-w64 buildbruvzg
2017-12-15Remove debug printf on WindowsRémi Verschelde
2017-12-15Merge pull request #14604 from mhilbrunner/http-defaultsRémi Verschelde
HTTP cleanup & better defaults
2017-12-15[DOCS] Completed the docs for the Navigation node.Nathan Warden
2017-12-15Add missing godot_get_stack_bottom and godot_get_global_constants in ↵Emmanuel Leblond
gdnative_api.json
2017-12-14Merge pull request #14672 from akien-mga/openmp-linkingRémi Verschelde
openmp: Simplify linking on X11, fixing clang build
2017-12-14Merge pull request #14674 from djrm/pr_visual_improvementsRémi Verschelde
Updated icons
2017-12-14Updated iconsDaniel J. Ramirez
[ciskip]
2017-12-14openmp: Simplify linking on X11, fixing clang buildRémi Verschelde
2017-12-14Merge pull request #14667 from bruvzg/macports-clang-impRémi Verschelde
Minor improvements for #14658 (MacPorts clang support)
2017-12-14MacPorts clang version selection, and OpenMP linking fix.bruvzg
2017-12-14GDScript files are converted to binary on export now.Juan Linietsky
2017-12-14Fix type mismatch in OS::set_borderless_windowRémi Verschelde
Closes #14663.
2017-12-14Merge pull request #14662 from akien-mga/openmp-clangRémi Verschelde
openmp: Don't try to link GCC's implementation on Clang
2017-12-14openmp: Don't try to link GCC's implementation on ClangRémi Verschelde
Also disable openmp build on Travis, breaks on Trusty's Clang. Group deps more naturally.
2017-12-14Merge pull request #14657 from Valentactive/fix_compiling_new_lightmapperRémi Verschelde
fix for compiling the new lightmapper
2017-12-14Merge pull request #14658 from bruvzg/macports-clangRémi Verschelde
Adds `macports_clang` build flag.
2017-12-14Adds `macports_clang` build flag to build using clang-5.0 form MacPorts ↵bruvzg
(with OpenMP support).
2017-12-14fix for compiling the new lightmapperMichele Valente
also changed two calls that were ambiguous
2017-12-14Merge pull request #14654 from ColinKinloch/masterRémi Verschelde
Fixed inconsistent use of tabs and spaces in indentation.
2017-12-14Added indent_style to editorconfig, fixed inconsistent use of tabs and ↵Colin Kinloch
spaces in indentation.
2017-12-14-Add lightmapperJuan Linietsky
-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)
2017-12-14HTTP cleanup & better defaultsmhilbrunner
2017-12-13[DOCS] Animation, CanvasItem, Curve3D, CurveWill Nations
2017-12-14Revert property changes in "[DOCS] AnimationPlayer new props, members/methods"Rémi Verschelde
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.
2017-12-13Merge pull request #14638 from mhilbrunner/patch-7Rémi Verschelde
[DOCS] JSON: Small fixes
2017-12-13Merge pull request #14633 from poke1024/fix-richtextlabel-crashRémi Verschelde
Fix crash (and bug) in RichTextLabel
2017-12-13[DOCS] JSON: Small fixesMax Hilbrunner
2017-12-13Fix crash (and bug) in RichTextLabelpoke1024
2017-12-13Merge pull request #14626 from Hinsbart/module_envRémi Verschelde
Scons: Build modules in seperate env.
2017-12-13TileMapEditor: Fix tile placement.Andreas Haas
Fixes #14625
2017-12-13Scons: Build modules in seperate env.Andreas Haas
2017-12-13Merge pull request #14499 from akien-mga/glsl-bone-typeRémi Verschelde
Fix usage of signed type in skeleton shader
2017-12-13Merge pull request #14587 from hoelzl/pr-no-std-arg-on-msvcRémi Verschelde
Don't pass -std=gnu++11 to MSVC
2017-12-13Merge pull request #14591 from mhilbrunner/patch-6Rémi Verschelde
Small fix in stream_peer_openssl: missing break, formatting
2017-12-13Merge pull request #14593 from Hinsbart/mono_envRémi Verschelde
Mono: Build in cloned env.
2017-12-13Merge pull request #14596 from Noshyaar/prRémi Verschelde
Enhance undoredo action name, TTR, cleanup
2017-12-13Merge pull request #14603 from YeldhamDev/tileset_buttonNoshyaar
Fixed Tileset editor button having the wrong text and not being translatable
2017-12-12Fixed Tileset editor button having the wrong text and not being translatable.Michael Alexsander Silva Dias
2017-12-12Change -std=gnu++11 to -stc=c++11 and don't pass flag to MSVCMatthias Hoelzl
2017-12-12Merge pull request #14595 from hpvb/fix-mingw-buildRémi Verschelde
Fix mingw build for thekla_atlas
2017-12-12Fix mingw build for thekla_atlasHein-Pieter van Braam