summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12936 from n-pigeon/planar_scale_gizmoRémi Verschelde2017-11-202-8/+123
|\
| * Implemented planar scaling with two modes.Przemysław Gołąb (n-pigeon)2017-11-142-8/+123
* | Merge pull request #12950 from ianb96/code_foldingRémi Verschelde2017-11-206-141/+683
|\ \
| * | scrolling fixesIan2017-11-185-194/+310
| * | TextEdit code foldingIan2017-11-176-63/+489
* | | Merge pull request #13051 from akien-mga/check-gles3-supportRémi Verschelde2017-11-201-23/+16
|\ \ \
| * | | Check whether GL context supports the expected APIRémi Verschelde2017-11-191-23/+16
* | | | Merge pull request #13042 from gad-o/customIconFixRémi Verschelde2017-11-201-0/+2
|\ \ \ \
| * | | | Fix #10798: Fixes Change Type does not change iconOrkun2017-11-191-0/+2
* | | | | Merge pull request #13059 from dragmz/13009Rémi Verschelde2017-11-191-1/+1
|\ \ \ \ \
| * | | | | Fix Regression: running current scene (unsaved) will ask for main sceneMarcin Zawiejski2017-11-191-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #13030 from Krakean/masterRémi Verschelde2017-11-192-0/+44
|\ \ \ \ \
| * | | | | Add "View FPS" in 3D->Perspective's popup.Dmitry Koteroff2017-11-202-0/+44
| | |_|/ / | |/| | |
* | | | | Merge pull request #13056 from RoyBerube/masterRémi Verschelde2017-11-191-0/+5
|\ \ \ \ \
| * | | | | Visual Studio project creation bug fixRoyBerube2017-11-191-0/+5
* | | | | | Merge pull request #13000 from djrm/pr_import_fixesRémi Verschelde2017-11-194-22/+40
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Improved packed scene previews.Daniel J. Ramirez2017-11-173-18/+34
| * | | | | Fixed mesh importing when multiple materials are presentDaniel J. Ramirez2017-11-171-4/+6
* | | | | | Revert "change low cpu delay to 1 usec, should make editor smoother and not r...Rémi Verschelde2017-11-191-2/+1
* | | | | | Merge pull request #13018 from hoelzl/pr-cpp-hintRémi Verschelde2017-11-193-0/+15
|\ \ \ \ \ \
| * | | | | | Add cpp.hint file to improve IntelliSenseMatthias Hoelzl2017-11-193-0/+15
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #13045 from akien-mga/gles2-cleanupRémi Verschelde2017-11-1922-134/+32
|\ \ \ \ \ \
| * | | | | | Cleanup old references to GLES2 rendererRémi Verschelde2017-11-1922-134/+32
| |/ / / / /
* | | | | | Merge pull request #13052 from djrm/pr_fixesRémi Verschelde2017-11-191-0/+1
|\ \ \ \ \ \
| * | | | | | Fix import obj as scene.Daniel J. Ramirez2017-11-191-0/+1
* | | | | | | Merge pull request #13001 from capnm/fix_class_docs_inline_markupRémi Verschelde2017-11-1910-10/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix the class docs for the rst-syntax errors.Martin Capitanio2017-11-1910-10/+11
|/ / / / / /
* | | | | | Merge pull request #13046 from AndreaCatania/kinfixRémi Verschelde2017-11-194-88/+177
|\ \ \ \ \ \
| * | | | | | Added null check in Bullet cast_motion APIAndreaCatania2017-11-191-10/+12
| * | | | | | Fixed gravity scaleAndreaCatania2017-11-191-1/+2
| * | | | | | Removed dynamic_cast from Bullet ServerAndreaCatania2017-11-191-14/+18
| * | | | | | Fixed kinematic movement on concave shapeAndreaCatania2017-11-194-64/+146
* | | | | | | Merge pull request #13044 from eska014/enginejsRémi Verschelde2017-11-195-94/+137
|\ \ \ \ \ \ \
| * | | | | | | Change HTML5 start-up APILeon Krause2017-11-195-94/+137
* | | | | | | | Merge pull request #13043 from volzhs/post-importRémi Verschelde2017-11-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Restore post_import functionvolzhs2017-11-191-1/+1
* | | | | | | | | Merge pull request #13040 from RandomShaper/fix-signals-dupRémi Verschelde2017-11-192-4/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix duplication of signalsPedro J. Estébanez2017-11-192-4/+22
| |/ / / / / / / /
* | | | | | | | | Merge pull request #13039 from sketchyfun/animation_key_selection_fixRémi Verschelde2017-11-191-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed issue with animation keys that are on frame 0 being difficult to clickBenH2017-11-191-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #12955 from groud/editor_canvas_item_api_reworkPoommetee Ketson2017-11-2031-499/+286
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rework the canvas_item API for further improves to the canvas item editorGilles Roudiere2017-11-1931-499/+286
| |/ / / / / / / /
* | | | | | | | | Merge pull request #13033 from MednauN/masterRémi Verschelde2017-11-191-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add currency code to iOS product details responseEvgeny Zuev2017-11-191-0/+3
* | | | | | | | | | Merge pull request #13031 from YeldhamDev/dock_labelRémi Verschelde2017-11-191-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Added a label to the Dock Positioner.Michael Alexsander Silva Dias2017-11-191-1/+6
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13015 from hoelzl/pr-vs-no-progressRémi Verschelde2017-11-191-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Suppress progress messages in Visual Studio output paneMatthias Hoelzl2017-11-181-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #13016 from neikeq/issue-13011Rémi Verschelde2017-11-192-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Mono: Fix compiler error with Variant::operator AABB()Ignacio Etcheverry2017-11-182-2/+2
| |/ / / / / / / /