aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | Added some clean up in camera/viewport management. Fixes #12279, Fixes #12774Juan Linietsky2017-12-072-4/+8
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | ability to keep user tracks when importing animations, closes #12801Juan Linietsky2017-12-074-4/+46
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #14356 from volzhs/ios-delegate-masterRémi Verschelde2017-12-071-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use application:didFinishLaunchingWithOptions: instead of application…
| * | | | | | | | | | | | | | | | | | | use application:didFinishLaunchingWithOptions: instead of ↵volzhs2017-12-071-1/+2
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applicationDidFinishLaunching: for iOS
* | | | | | | | | | | | | | | | | | | Merge pull request #14332 from akien-mga/clang-formatRémi Verschelde2017-12-07208-900/+994
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update style for clang-format 5.0.0, new min required version
| * | | | | | | | | | | | | | | | | | | Style: Apply new clang-format 5.0 style to all filesRémi Verschelde2017-12-07199-875/+954
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Style: Update definitions for clang-format 5.0.0Rémi Verschelde2017-12-073-19/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be the new standard from now on.
| * | | | | | | | | | | | | | | | | | | Style: Apply clang-format again on all filesRémi Verschelde2017-12-0713-23/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issues introduced by newer clang-format versions or commits pushed directly without using the clang-format pre-commit hook.
* | | | | | | | | | | | | | | | | | | | Merge pull request #14368 from sersoong/master-addoaandscriptRémi Verschelde2017-12-071-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add uppercase and lowercase to rightclickmenu in scripteditor
| * | | | | | | | | | | | | | | | | | | | Add uppercase and lowercase to rightclickmenu in scripteditorsersoong2017-12-071-0/+2
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | doc: Sync classref after a496dd4d, removing NOEDITOR properties from docRémi Verschelde2017-12-0733-169/+350
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | doc: Sync classref with current sourceRémi Verschelde2017-12-0712-197/+69
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #14366 from willnationsdev/docsRémi Verschelde2017-12-075-21/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] ARVRController, ARVRPositionalTracker, AStar, AtlasTexture, Basis
| * | | | | | | | | | | | | | | | | | | [DOCS] ARVR, AStar, AtlasTexture, BasisWill Nations2017-12-075-21/+28
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #14352 from ianb96/get_hidden_widthRémi Verschelde2017-12-072-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes horizontal scrolling over hidden lines
| * | | | | | | | | | | | | | | | | | | fixes horizontal scrolling over hidden linesIan2017-12-062-6/+12
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #14362 from sersoong/master-addcopypathRémi Verschelde2017-12-072-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'copy script path' to script editor plugin
| * | | | | | | | | | | | | | | | | | | Add 'copy script path' to script editor pluginsersoong2017-12-072-0/+15
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #14353 from TheAspiringHacker/fix-lineedit-eatRémi Verschelde2017-12-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for icon in LineEdit::set_cursor_position
| * | | | | | | | | | | | | | | | | | | Check for icon in LineEdit::set_cursor_positionTheAspiringHacker2017-12-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14340
* | | | | | | | | | | | | | | | | | | | Merge pull request #14360 from mrcdk/fix_win_mingwRémi Verschelde2017-12-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix windows compilation when using MinGW
| * | | | | | | | | | | | | | | | | | | | Fix windows compilation when using MinGWMrCdK2017-12-071-1/+1
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Travis: Install libxi-dev after #14347Rémi Verschelde2017-12-071-0/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #13362 from groud/fix_foldingRémi Verschelde2017-12-072-18/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Fixes folding of blank lines
| * | | | | | | | | | | | | | | | | | | Fixes folding of blank linesGilles Roudiere2017-11-282-18/+17
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Reduce some graphics memory usage by disabling unnecesary modes, closes #12831Juan Linietsky2017-12-061-0/+2
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #14350 from willnationsdev/miscellaneous-docsRémi Verschelde2017-12-073-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] Camera2D, EditorScript, EditorFileSystemDirectory [ci skip]
| * | | | | | | | | | | | | | | | | | | | [DOCS] EditorScript methodsWill Nations2017-12-061-1/+3
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | [DOCS] EditorFileSystemDirectory methodsWill Nations2017-12-061-0/+13
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | [DOCS] Camera2D methods/constantsWill Nations2017-12-061-0/+10
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #13827 from sersoong/master-addopenselectionRémi Verschelde2017-12-071-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enhanced 'open' menu in filesystemdock
| * | | | | | | | | | | | | | | | | | | | Enhanced 'open' menu in filesystemdocksersoong2017-12-051-9/+13
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #13958 from jjjuande/fix_revert_buttonRémi Verschelde2017-12-072-15/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the revert button issue with instanced nodes
| * | | | | | | | | | | | | | | | | | | | | Fix the revert button issue with instanced nodesJuande2017-12-042-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method "check_reload_status" on the file "property_editor.cpp" didn't take into account if the field is a property of an instanced node just like the "update_tree" does. The code that checks this in "update_tree" has been extracted into the method "_is_instanced_node_with_original_property_different" to be also used in "check_reload_status". Fixes #13415
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #13956 from poke1024/fix-poly2d-mode-changeRémi Verschelde2017-12-071-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Polygon2D wip mode closing when editing mode is changed
| * | | | | | | | | | | | | | | | | | | | | | Fixes Polygon2D wip mode closing when editing mode is changedBernhard Liebl2017-12-041-2/+5
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #14002 from poke1024/fixhelpspeedRémi Verschelde2017-12-072-71/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make "Search Help" more responsive
| * | | | | | | | | | | | | | | | | | | | | | Make "Search Help" more responsivepoke10242017-12-062-71/+86
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #14003 from karroffel/dictionary-iterate-fixRémi Verschelde2017-12-071-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix Dictionary iteration
| * | | | | | | | | | | | | | | | | | | | | | | fix Dictionary iterationkarroffel2017-12-051-1/+3
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #14006 from akien-mga/tinyexrRémi Verschelde2017-12-073-171/+342
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix TinyEXR import bug and update to current master
| * | | | | | | | | | | | | | | | | | | | | | | TinyEXR: Fix EXR header when parsing pixels encoded as HALFRémi Verschelde2017-12-051-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also free the header and image properly after usage. Fixes #13490.
| * | | | | | | | | | | | | | | | | | | | | | | tinyexr: Update to current upstream master branchRémi Verschelde2017-12-052-129/+315
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Revert "Fix MinGW-w64 build of TinyEXR for old toolchains"Rémi Verschelde2017-12-052-37/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 37f5e1dcd94611dd5b670f013abf0323e8b47def.
* | | | | | | | | | | | | | | | | | | | | | | | Use run-time dynamic linking for AddDllDirectory and RemoveDllDirectory to ↵bruvzg2017-12-071-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support mingw-w64 build and Windows 7 with KB2533623.
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #14328 from YeldhamDev/popupmenu_submenu_fixRémi Verschelde2017-12-071-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed PopupMenu's submenus not showing up in certain situations
| * | | | | | | | | | | | | | | | | | | | | | | | Fixed PopupMenu's submenus not showing up in certain situations.Michael Alexsander Silva Dias2017-12-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #14347 from RandomShaper/adpod-mtJuan Linietsky2017-12-066-24/+224
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement multitouch on X11 and improve it on Windows
| * | | | | | | | | | | | | | | | | | | | | | | | | Remove guards for the now targeted Windows 7+Pedro J. Estébanez2017-12-062-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Add build param for targeted Windows versionPedro J. Estébanez2017-12-061-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | |