Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:quabug/godot
text cursor in text editor & const in Rect2i
Merge pull request #301 from jonyrock/editor_cursor

Text cursor in text editor
-Fixed viewport stretch bugs
-Fixed input in viewport stretch bugs
-Fixed tilemap pixel overlap (really?)
-Revert change that broke paths
heck
Merge branch 'master' of https://github.com/okamstudio/godot
Merge remote-tracking branch 'upstream/master'