Commit Graph

5678 Commits

Author SHA1 Message Date
Ray Koopa 98f01f9143 Respect style boxes for Button states other than "normal"
(cherry picked from commit 2baeb531e6)
2017-03-18 19:31:43 +01:00
Jesper Bækdahl e5f0183b0a x11: don't wait for window to be mapped
(cherry picked from commit 8f7a3884fd)
2017-03-18 19:29:46 +01:00
Rémi Verschelde 618ac3842e Merge pull request #8068 from Hinsbart/fix_ps_cross_2.1
InputMap: Rename joypad button "PS X" to "PS Cross". [2.1]
2017-03-18 14:52:59 +01:00
Andreas Haas 5cc184d732
InputMap: Rename joypad button "PS X" to "PS Cross". 2017-03-18 12:36:53 +01:00
Rémi Verschelde b5be9d6115 Merge pull request #8038 from RandomShaper/remove-warning-2.1
Remove warning on owner re-assignment (2.1)
2017-03-18 10:49:35 +01:00
Rémi Verschelde 58455f03f7 Merge pull request #8031 from RandomShaper/fix-redundant-connections-2.1
Fix redundant connections (2.1)
2017-03-18 10:46:59 +01:00
Pedro J. Estébanez 7b27cc91b1 Remove warning on owner re-assignment 2017-03-15 12:28:38 +01:00
Pedro J. Estébanez 148566b31b Fix redundant connections saved in sub-inheritance 2017-03-15 11:48:24 +01:00
Pedro J. Estébanez 6289997724 Fix ambiguity in StringName (null data vs. data with empty string) 2017-03-15 04:26:23 +01:00
Rémi Verschelde 8ea4413a2c Merge pull request #8016 from RandomShaper/optimize-assert-2.1
Skip asserts on non-debug builds at compiler level (2.1)
2017-03-13 11:08:47 +01:00
Rémi Verschelde c185fe1095 Merge pull request #7991 from BastiaanOlij/CoreMotion_2.1
Core motion for Godot 2.x (based on PR 7127)
2017-03-13 11:03:31 +01:00
Rémi Verschelde ce09a094ab Merge pull request #7987 from RandomShaper/fix-touch-button-2.1
Several fixes for TouchScreenButton (2.1)
2017-03-13 11:02:50 +01:00
Rémi Verschelde 3c566fc552 Merge pull request #7978 from RandomShaper/fix-sub-inheritance-2.1
Fix node duplication in scene sub-inheritance (2.1)
2017-03-13 11:00:59 +01:00
Rémi Verschelde e869a8a279 Merge pull request #7969 from RandomShaper/pr-7565-polish
PR 7565 + polish
2017-03-13 11:00:20 +01:00
Rémi Verschelde 91cf3c1321 Merge pull request #7957 from RandomShaper/fix-kb-2d-motion-2.1
Fix KinematicBody2D motion issues + KinematicBody2D.test_move_from() (2.1)
2017-03-13 10:59:53 +01:00
Pedro J. Estébanez 204a7481e0 Skip asserts on non-debug builds at compiler level 2017-03-13 00:23:42 +01:00
Pedro J. Estébanez 3be30efe8e Fixes for TouchScreenButton
- getting stuck on pause
- handling input when not visible
2017-03-10 14:11:54 +01:00
BastiaanOlij 8436a34305 Core motion for Godot 2.x (based on PR 7127) 2017-03-09 21:46:38 +11:00
Pedro J. Estébanez 6aef1c48c4 Fix node duplication in scene sub-inheritance 2017-03-08 19:58:59 +01:00
Rémi Verschelde 50c6a6d9b1 Merge pull request #7977 from eska014/2.1-web-window
Backport all web 'window' features to 2.1
2017-03-08 07:28:38 +01:00
eska 9518401100 Add window features in web export
- Add 'window' (canvas) resize, maximize and fullscreen
 - Implement get_screen_size
 - Fix fullscreen resolution

(cherry picked from commit 3e1b437315)
2017-03-07 14:11:00 +01:00
eska d34c530a7f Revert "Add fullscreen features in web export"
This reverts commit 17422f1f86.
2017-03-07 14:11:00 +01:00
Pedro J. Estébanez 1e79f80b90 Finish fix for POSITION in 2D shaders 2017-03-06 18:31:29 +01:00
Pedro J. Estébanez 95a5d9e617 Fix KinematicBody2D wrong motion origin
Got part of the fix from 5fc084c28e
Added an engine setting to enable the fix (physics_2d/motion_fix_enabled) which is false by default so the default behavior is the same as always
Added motion methods with a from parameter, the same as 3.0 does
2017-03-06 05:10:15 +01:00
Rémi Verschelde cc265d5506 Merge pull request #7910 from RandomShaper/single-field-prop-edit-2.1
Implement single-field property change for multinode edit (2.1)
2017-03-05 13:43:35 +01:00
Rémi Verschelde bfa3d70169 Travis: Disable Android builds for now
As we say in French, "Trop, c'est trop !".
Those builds fail 50% of the time due to timeouts, it's pointless to have them until we
find a better solution to install the Android SDK and NDK.

Workaround for #6973.
(cherry picked from commit d5c6806e16)
2017-03-05 13:40:45 +01:00
Rémi Verschelde 0f5b85f85a Merge pull request #7949 from RandomShaper/expose-more-geom-2.1
Expose uncapped versions of closest-point-to-segment utilities (2.1)
2017-03-05 12:04:20 +01:00
Rémi Verschelde eeca4a3aa3 Merge pull request #7933 from RebelliousX/2.1
TabContainer's signal changes (v2.1)
2017-03-05 12:03:38 +01:00
Thaer Razeq 886f150b4a - Added `tab_selected` signal which has same behavior as `tab_changed`
lest breaking current API, though, it is noted in the documentation of TabContainer
class, of the upcoming Godot (v3.0+) changes in behavior, that is, `tab_selected` will be
emitted for selecting any tab, while `tab_changed` only if a tab changes.
- Added `get_previous_tab()`. Which returns the previous shown tab. **Note:** In Godot v3.0+, only `tab_changed` can modify previous tab index.
- Add documentation for the added function and signals. Fix a typo too.
2017-03-05 03:26:53 -06:00
Pedro J. Estébanez e0170625ef Expose uncapped versions of closest-point-to-segment utilities 2017-03-04 22:57:53 +01:00
Rémi Verschelde bc56fa8d91 Merge pull request #7941 from RandomShaper/expose-geometry-2.1
Expose Geometry::get_closest_point_to_segment_2d() (2.1)
2017-03-04 17:00:45 +01:00
Rémi Verschelde e5a458d8d0 Merge pull request #7936 from volzhs/fix-input-android-2.1
Fix handling input for Android (2.1)
2017-03-04 16:59:58 +01:00
Rémi Verschelde c58c490d45 Merge pull request #7934 from lonesurvivor/area2d-fix_2.1
2.1: Fixes two problems with Area2D and remove_child()
2017-03-04 16:57:23 +01:00
Rémi Verschelde 9cf5058610 Merge pull request #7926 from volzhs/issue-7902
Fix wrong TreeItem reference after reconstructing (2.1)
2017-03-04 16:47:58 +01:00
Pedro J. Estébanez 25aedb896a Expose Geometry::get_closest_point_to_segment_2d() 2017-03-04 01:49:16 +01:00
volzhs c8edf071da Fix handling input for Android 2017-03-04 00:12:35 +09:00
lonesurvivor 5b556cab25 Fixes two problems with Area2D and remove_child()
- When one of two or more overlapping Area2Ds is removed with remove_child(), it doesn't try to report to the
other one anymore
- When overlappinng Area2Ds are removed woth remove_child(), _enter_tree and _exit_tree signals are now
properly disconnected upon removal
2017-03-03 11:36:50 +01:00
volzhs 4a8d2b676e Fix wrong TreeItem reference after reconstructing 2017-03-03 03:51:23 +09:00
Pedro J. Estébanez e46e12906a Implement single-field property change for multinode edit 2017-03-02 10:48:24 +01:00
Rémi Verschelde 43574f65da Merge pull request #7909 from RandomShaper/cp-tileset-modulate-2.1
Cherry-pick modulate (color) for TileSet tiles (2.1)
2017-03-01 10:08:01 +01:00
Pedro J. Estébanez b6721caa13 Add modulate (color) to TileSet tiles
(cherry picked from commit 86789c7071)
2017-03-01 03:21:47 +01:00
Rémi Verschelde d79f44da62 Merge pull request #7852 from volzhs/cache-font-2.1
Cache DynamicFont resource for Android (2.1)
2017-02-27 23:35:35 +01:00
Rémi Verschelde ee9f31a5cc Merge pull request #7716 from GodotExplorer/pr-resizable-texturebutton
[2.1] Enhance TextureButton and TextureFrame with resize
2017-02-27 23:30:53 +01:00
Rémi Verschelde e9e5affda1 Merge pull request #7896 from RandomShaper/particles2d-process-mode-2.1
Add process mode option to Particles2D (2.1)
2017-02-27 14:03:46 +01:00
Pedro J. Estébanez 7e90b98db2 Add process mode option to Particles2D 2017-02-27 10:45:06 +01:00
Rémi Verschelde f67881bada Merge pull request #7873 from volzhs/issue-7820
Fix crash when click icon while editing node name (2.1)
2017-02-26 20:27:53 +01:00
Rémi Verschelde 6490e9ae5b Merge pull request #7868 from RandomShaper/fix-touchbutton-crash-2.1
Fix crash if TouchScreenButton is pressed while exiting the tree (2.1)
2017-02-26 20:27:35 +01:00
Rémi Verschelde 902288cc8c Merge pull request #7855 from RandomShaper/add-duplicate-flags-2.1
Add flags parameter to Node.duplicate()
2017-02-26 20:23:55 +01:00
Rémi Verschelde 02a3d08d93 Merge pull request #7829 from volzhs/libwebp-0.6.0-2.1
Update libwebp to 0.6.0 (for 2.1)
2017-02-26 20:14:44 +01:00
volzhs 3d817ac73a Fix crash when click icon while editing node name 2017-02-23 02:16:49 +09:00