aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8891 from nunodonato/newmenuRémi Verschelde2017-05-252-156/+113
|\ | | | | Join text menus on the top-left, move shortcut buttons to new locations (Preliminary work towards achieving the changes discussed in #8865.)
| * Join text menus on the top-left, move shortcut buttons to new locationNuno Donato2017-05-242-156/+113
| |
* | Merge pull request #8885 from capnm/fix-2d-editor-zoomRémi Verschelde2017-05-251-1/+1
|\ \ | | | | | | Fix 2D-editor mouse wheel zoom for x11.
| * | Fix 2D-editor mouse wheel zoom (x11).Martin Capitanio2017-05-241-1/+1
| |/ | | | | | | Fixes #8888
* | Merge pull request #8878 from BastiaanOlij/ios_make_arm64_defaultRémi Verschelde2017-05-251-8/+9
|\ \ | | | | | | Make arm64 the default option and set minimum to iOS 9
| * | Make arm64 the default option and set minimum to iOS 9BastiaanOlij2017-05-231-8/+9
| | |
* | | Merge pull request #8869 from Hinsbart/errorsRémi Verschelde2017-05-254-7/+5
|\ \ \ | |_|/ |/| | Fix errors on engine startup.
| * | Fix errors on engine startup.Andreas Haas2017-05-224-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bunch of the most spammy console errors introduced by recent refactorings: - `AudioServerState` does not exist, this was the reference to it in the source. The surrounding code made it clear that `AudioServerLayout` was meant to be used instead. - `StreamCSVTranslation` same here, it's the only reference. I went with `Translation` here, but I'm not 100% sure on this one. - Some methods have been moved from `Texture` to `Image`, but the old bindings were still there. - A few `name == ""` errors related to duplicating nodes.
* | | Merge pull request #8884 from karroffel/gdnative-fixesThomas Herzog2017-05-234-15/+8
|\ \ \ | | | | | | | | [GDNative] fixed some functions that returned references
| * | | [GDNative] fixed some functions that returned referencesKarroffel2017-05-234-15/+8
|/ / / | | | | | | | | | Those errors were introduced with #8821 (6fd217d). These functions need to return reference types, otherwise setting values on those containers does not work.
* | | Merge pull request #8881 from vnen/uwp-3Rémi Verschelde2017-05-235-87/+74
|\ \ \ | | | | | | | | Fix UWP compilation issues
| * | | Fix UWP compilation issuesGeorge Marques2017-05-235-87/+74
|/ / / | | | | | | | | | Also fix VS2017 compilation problems.
* | | Merge pull request #8880 from vnen/fix-canvas-item-editor-crashRémi Verschelde2017-05-231-2/+2
|\ \ \ | |_|/ |/| | Fix crash when interacting with the 2d editor
| * | Fix crash when interacting with the 2d editorGeorge Marques2017-05-231-2/+2
| | |
* | | Merge pull request #8877 from BastiaanOlij/fix_ios_godot3Rémi Verschelde2017-05-233-10/+21
|\ \ \ | |/ / |/| | More fixes for iOS Godot 3.0
| * | More fixes for iOS Godot 3.0BastiaanOlij2017-05-233-10/+21
| | | | | | | | | | | | | | | | | | - nicely exit if initialisation fails - fix a few issues around new event handling - use 16bit single channel framebuffer as 32bit is not supported on iOS
* | | Merge pull request #8876 from BastiaanOlij/fix_vs15Rémi Verschelde2017-05-233-51/+58
|\ \ \ | |/ / |/| | Fix a few issues compiling windows and using VS2015 and earlier
| * | Fix a few issues compiling windows and using VS2015 and earlierBastiaanOlij2017-05-233-51/+58
| | |
* | | -Fix the "set_val" call deferred, it was the only one.. closes #8742Juan Linietsky2017-05-232-2/+2
| | | | | | | | | | | | -Removed redundant bind in input_event
* | | Fix stex import into black textures when lossless and lossy are selected, ↵Juan Linietsky2017-05-232-2/+3
|/ / | | | | | | closes #8801
* | fixed crash on code that checks InputEventJuan Linietsky2017-05-231-1/+1
| |
* | Merge pull request #8872 from volzhs/editor-theme-lineeditRémi Verschelde2017-05-231-4/+5
|\ \ | |/ |/| Fix disabled style of LineEdit
| * Fix disabled style of LineEditvolzhs2017-05-231-4/+5
| |
* | Merge pull request #8863 from volzhs/editor-theme-new-nodeRémi Verschelde2017-05-221-1/+1
|\ \ | | | | | | Show description box on create new node window
| * | Show description box on create new node windowvolzhs2017-05-221-1/+1
| |/
* | Merge pull request #8862 from volzhs/editor-theme-marginRémi Verschelde2017-05-221-0/+1
|\ \ | | | | | | Fit grid with label and component of editor
| * | Fit grid with label and component of editorvolzhs2017-05-221-0/+1
| |/
* | Merge pull request #8861 from volzhs/editor-theme-filedialogRémi Verschelde2017-05-221-0/+5
|\ \ | | | | | | Show disabled item with proper color on FileDialog of editor theme
| * | Show disabled item with proper color on FileDialog of editor themevolzhs2017-05-221-0/+5
| |/ | | | | | | Fix #8635
* | Merge pull request #8786 from bojidar-bg/fix-astar-weight-scaleRémi Verschelde2017-05-221-4/+2
|\ \ | | | | | | Fix weigth scale of A* being applied to the whole estimation
| * | Fix weigth scale of A* being applied to the whole path and estimationBojidar Marinov2017-05-221-5/+2
| | | | | | | | | | | | Attempt to fix #8584
* | | Merge pull request #8850 from tagcup/astar_overestimateRémi Verschelde2017-05-222-1/+2
|\ \ \ | | | | | | | | Avoid overestimating the cost in AStar heuristics.
| * | | Avoid overestimating the cost in AStar heuristics.Ferenc Arn2017-05-212-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | This is a necessary condition for finding optimal solutions. This is achieved by simply requiring/ensuring that no weights are smaller than 1. Fixes #8584.
* | | Merge pull request #8853 from toger5/InputEvent_osx_fixRémi Verschelde2017-05-221-137/+143
|\ \ \ | | | | | | | | fixed osx input event
| * | | added modifier key to scroll eventtoger52017-05-221-34/+34
| | | |
| * | | fixed osx input eventtoger52017-05-221-135/+141
| |/ /
* | | Merge pull request #8832 from Zireael07/vehicle-improvs-masterRémi Verschelde2017-05-222-0/+23
|\ \ \ | | | | | | | | Expose wheel's contact to GDScript and set roll influence in editor [3.0]
| * | | GDScript can now tell if the wheel is in contact with the ground; change ↵Zireael072017-05-202-0/+23
| | | | | | | | | | | | | | | | roll influence of the wheel in editor
* | | | Merge pull request #8854 from toger5/fix_color_picker_crashRémi Verschelde2017-05-221-1/+1
|\ \ \ \ | | | | | | | | | | fixed crash when dragging to change color in color picker
| * | | | fixed crash when dragging to change color in color pickertoger52017-05-211-1/+1
| | |/ / | |/| |
* | | | Merge pull request #8852 from voithos/bezier-controls-fixRémi Verschelde2017-05-221-85/+53
|\ \ \ \ | |/ / / |/| | | Fix 2d path editor controls.
| * | | Fix 2d path editor controls.Zaven Muradyan2017-05-211-85/+53
|/ / / | | | | | | | | | | | | Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
* | | Removal of InputEvent as built-in Variant type..Juan Linietsky2017-05-20206-9039/+8419
| | | | | | | | | | | | this might cause bugs I haven't found yet..
* | | Merge pull request #8842 from BastiaanOlij/expose_texture_idRémi Verschelde2017-05-205-0/+12
|\ \ \ | | | | | | | | Added texture_get_texid
| * | | Added texture_get_texidBastiaanOlij2017-05-205-0/+12
| |/ /
* | | Merge pull request #8841 from BastiaanOlij/osx_cleanup_old_classesRémi Verschelde2017-05-206-518/+2
|\ \ \ | | | | | | | | Removing unused files and old GLFW comments on OSX
| * | | Doing a little bit of cleanupBastiaanOlij2017-05-206-518/+2
| |/ /
* | | Merge pull request #8838 from zlsa/masterRémi Verschelde2017-05-202-12/+15
|\ \ \ | | | | | | | | Export nested nodes in TileSet scenes; resolves #8819.
| * | | Fix #8819. Adds _import_node() that, when used in conjunction with ↵Jon Ross2017-05-192-12/+15
| |/ / | | | | | | | | | _import_scene, recurses through the scene tree and exports all available nodes.
* | | Merge pull request #8829 from supagu/astar-bidirectionalRémi Verschelde2017-05-202-4/+6
|\ \ \ | | | | | | | | Added bool to allow astar points to be connected in one direction only