Commit Graph

6225 Commits

Author SHA1 Message Date
Andreas Haas b694f58959 TileMap: Fix infinite loop when trying to bucket-delete empty tiles.
Right-clicking when the bucket tool is enabled means "erase all instances of this tile".
So it doesn't make sense to try doing this for empty tiles :P

Fixes #10065

(cherry picked from commit 95da12212b)
2017-08-13 18:00:25 +02:00
Poommetee Ketson 4f3abf48d3 MenuButton: defer grab_click_focus until button_up
(cherry picked from commit 49ec6c4380)
2017-08-13 17:57:52 +02:00
Andrii Doroshenko (Xrayez) 7011f11615 Bind some useful methods in SurfaceTool to GDScript
These include:
* generate_tangents()
* add_to_format()
* create_from()
* append_from()

Reordered and grouped the bindings to match the header for improved readability.

Removed commented out `generate_flat_normals()` method which wasn't present
in the header.

Fixes #9946

(cherry picked from commit aa1165a3f5)
2017-08-13 17:55:40 +02:00
Rémi Verschelde 97c3f66b7c Merge pull request #10317 from Corruptinator/2.1
Fixed OUYA Controller Mapping!
2017-08-13 17:34:06 +02:00
Rémi Verschelde 06ef909904 Merge pull request #10306 from marcelofg55/move_and_slide
Ported move_and_slide funcs from 3.0 branch
2017-08-13 17:31:26 +02:00
Rémi Verschelde 042cee8b88 Merge pull request #10295 from raymoo/portstreampeerbuffer
Port StreamPeerBuffer to 2.1
2017-08-13 17:24:01 +02:00
Corruptinator aef0554386 Fixed OUYA Controller Mapping!
The input_default.cpp now has the corrected OUYA Game Controller Mapping
which allows the game console to respond to the controller!
2017-08-13 02:34:22 -07:00
Marcelo Fernandez 692f97ba9c Ported move_and_slide funcs from 3.0 branch 2017-08-12 12:00:49 -03:00
Raymoo 1aedd48929 Port StreamPeerBuffer to 2.1 2017-08-12 01:08:35 -07:00
Rémi Verschelde 1a4c8e8a73 Merge pull request #10199 from jjay/f/stretch_aspect_expand_21
[2.1] Add "expand" option for stretch aspect, no more black bars
2017-08-11 15:55:49 +02:00
Rémi Verschelde ac79f831af Merge pull request #10192 from ISylvox/ChildProcessConnected-scary-to-friendly-2.1
[2.1] Editor Debugger: Changed the Color of Child Process Connected
2017-08-11 10:38:58 +02:00
Rémi Verschelde 6a9a5fe06d Merge pull request #10165 from ISylvox/resoucre-to-resource-2.1
[2.1] Core/[io;object]: Fix Typo in resource_format_binary;object
2017-08-11 10:36:40 +02:00
Yakov Borevich 3401ca6803 [2.1] Add expand stretch/ascpect - no more black bars 2017-08-09 12:30:06 +03:00
Indah Sylvia 478531d5a8 Child Process Connected (in Editor Debugger) is now friendlier :-) 2017-08-09 12:56:27 +07:00
Indah Sylvia 5014b9dc40 core/[io;object]: fix typo 'resoucre' to 'resource' 2017-08-08 18:07:29 +07:00
Rémi Verschelde 69f650f98f Merge pull request #9983 from marcelofg55/ieee32_float
Implement 32 bit IEEE float WAVE format
2017-08-08 10:03:33 +02:00
Rémi Verschelde ee7e649e69 Merge pull request #10125 from marcelofg55/fixeditor_crash
Add missing NULL checks to prevent possible crashes on _add_geometry
2017-08-07 14:56:43 +02:00
Rémi Verschelde afcecd63a1 Merge pull request #10100 from bruvzg/2.1-fix-osx-warp_mouse_pos
Fix warp_mouse_pos on macOS [2.1]
2017-08-07 14:48:21 +02:00
Marcelo Fernandez 45096ee62c Add missing NULL checks to prevent possible crashes on _add_geometry 2017-08-06 10:37:37 -03:00
bruvzg 5b76a456da Fix warp_mouse_pos on macOS 2017-08-05 00:00:05 +03:00
Rémi Verschelde 6a07c98112 Merge pull request #10044 from GodotExplorer/pr-fix-debugger-loop-inspect-remote-obj
Don't re-query remote object while debugging every frame
2017-08-04 12:32:40 +02:00
Rémi Verschelde e87b6d4c63 Merge pull request #9978 from ISylvox/update-gradle-android-for-2.1
[2.1] Update Gradle-Android buildtool
2017-08-04 09:45:21 +02:00
Rémi Verschelde e160084c40 Merge pull request #10054 from Hassan-A/raycastfix
ray cast 2d arrow fix
2017-08-03 13:34:27 +02:00
Rémi Verschelde ef75550893 Merge pull request #10056 from marcelofg55/scons_fix
Fix scons failing when not building sources
2017-08-03 10:47:31 +02:00
Marcelo Fernandez 0e027955f2 Fix scons failing when not building sources 2017-08-02 22:13:10 -03:00
Hassan A beddde97af ray cast 2d arrow fix
fixes #9636
2017-08-02 20:06:35 -04:00
geequlim 21f2fff82e Don't re-query remote object while debugging every frame 2017-08-02 22:31:43 +08:00
Rémi Verschelde 04ff3e4238 Merge pull request #9975 from Hassan-A/2.1
added get_used_cells_by_id method
2017-08-02 14:21:54 +02:00
Hassan A aa457ab8e7 added get_used_cells_by_id method
This method will return an array of positions by a specific tile id.
2017-08-02 06:10:50 -04:00
Rémi Verschelde 303893144b Merge pull request #9991 from ISylvox/improve-godot-2to3-exporter
[2.1] Several Enhancement for "Godot 2 to 3" Exporter
2017-08-01 09:48:00 +02:00
ISylvox de55a0076c Several enhancement for 'Godot 2 to 3' project exporter. 2017-08-01 08:10:21 +07:00
Rémi Verschelde bba0be7967 Merge pull request #9885 from bruvzg/2.1-win-num-enter-fix
Fix Numpad Enter key on Windows (2.1)
2017-07-31 22:59:32 +02:00
Rémi Verschelde c2fd0e65f7 Merge pull request #9986 from marcelofg55/2.1
Fix get_screen_* funcs returning old values after resolution changes on OS X
2017-07-31 14:03:15 +02:00
Rémi Verschelde 3a8550675f X11: Do not force require system OpenSSL to build 2017-07-31 00:14:04 +02:00
Rémi Verschelde c1f54e1a45 Style: Apply clang-format on all files
Thus fixing some invalid changes that had still made it to the 2.1 branch.
2017-07-30 23:00:25 +02:00
Marcelo Fernandez 6eedfe4ecb Fix get_screen_* funcs returning old values after resolution changes on OS X 2017-07-30 16:58:00 -03:00
Rémi Verschelde 6d3fea6864 doc: Sync classref with current source 2017-07-30 21:47:34 +02:00
bruvzg ad034962f1 Change display scale when moving the window from monitor to monitor
(cherry picked from commit d18922a56e)
2017-07-30 21:42:17 +02:00
AlexHolly c1c29b1820 fix missing DEFVAL
(cherry picked from commit 4062456c41)
2017-07-30 21:41:47 +02:00
Rémi Verschelde 437cac9f55 Make MinGW test less verbose on non-Bash shells
The &> construct seems to be Bash-specific.
Supersedes #9755.

(cherry picked from commit 9f768cb519)
2017-07-30 21:36:36 +02:00
Pedro J. Estébanez 7459c43750 Remove ANDROID define
Fixes GDNative build error on Android.

It's also discouraged by Google to rely on it. In case someone needs to check, use ``__ANDROID__`` instead, provided by the very same compiler.

(cherry picked from commit 6ea233434a)
2017-07-30 21:34:59 +02:00
Poommetee Ketson 432d30bfd1 Docs: fix broken ref tags
(cherry picked from commit 90c2c1e7f8)
2017-07-30 21:29:21 +02:00
Poommetee Ketson 9e8a8619a1 Docs: ignore tags inside code,codeblock tag
(cherry picked from commit 5bbbecc315)
2017-07-30 21:25:11 +02:00
L. Krause e06ce95655 Fix building HTML5 when cmd.exe is set up for MSVC
(cherry picked from commit b0e387a012)
2017-07-30 21:24:44 +02:00
Paulb23 4aca27e2fa Fixed script tab selection on file close, issue 8400
(cherry picked from commit 3906134003)
2017-07-30 21:23:19 +02:00
Hubert Jarosz 75b154f7e0 make use of 2 cores in Travis CI
(cherry picked from commit 283ba78399)
2017-07-30 21:21:48 +02:00
Poommetee Ketson 33bdd92f1e LineEdit: don't undo uneditable LineEdit
(cherry picked from commit 9be034a8cd)
2017-07-30 21:14:13 +02:00
Andreas Haas 992b415702 Bindings: Fix Object::get_meta return type.
The method was shown as void in the docs.

(cherry picked from commit 2b7b67b7b1)
2017-07-30 21:12:08 +02:00
David Carlier 14392c9798 get_executable_path slight change to make it work under OpenBSD
(cherry picked from commit df87ad14d0)
2017-07-30 21:11:02 +02:00
Maxwell Paul Brickner 577c8714c7 Changed badge to use HTTPS
Howdy!

I just changed the Code Triage badge to use https instead of http.

Thanks for your time! :D

(cherry picked from commit 1dcd4d3624)
2017-07-30 21:10:21 +02:00