Commit Graph

6559 Commits

Author SHA1 Message Date
Pedro J. Estébanez 4511241991 Implement multitouch on X11 2017-12-07 00:00:24 +01:00
Rémi Verschelde b87cbe7994
Merge pull request #14327 from RandomShaper/fix-chmod-error-2.1
Fix Windows-to-Linux export error (2.1)
2017-12-06 23:16:21 +01:00
Pedro J. Estébanez c356fbe05f Fix Windows-to-Linux export error
Now chmod() returns ERR_UNAVAILABLE by default, to signal the caller the problem is lack of support instead of a failed operation.
2017-12-06 20:28:00 +01:00
Andreas Haas 88ffa04be4
Merge pull request #14001 from rraallvv/disable_stop_button
Disable stop button if the scene is not running (2.1)
2017-12-05 16:33:02 +00:00
Rhody Lugo a30a78dfdb disable stop button if the scene is not running 2017-12-05 11:44:49 -04:00
Xavier Sellier eb8952e995 Vector2 and Vector3 are not properly parsed
This commit should solve https://github.com/godotengine/godot/issues/13425
It has been tested manually and it works like a charm
2017-11-30 21:53:50 -05:00
Rémi Verschelde 7983fb95b0
Merge pull request #13400 from marcelofg55/wasapi_fix
Fix wasapi going silent when number of channels are not supported
2017-11-30 20:52:16 +01:00
Marcelo Fernandez dc26585bf4 Fix wasapi going silent when number of channels are not supported 2017-11-29 12:34:11 -03:00
Rémi Verschelde 681aa44788
Merge pull request #13397 from ISylvox/export-logo-2.1
[2.1] Enhance UWP Logo on Export Dialog
2017-11-29 14:09:09 +01:00
Indah Sylvia 88b6c49e22 Enhanced UWP logo on Export dialog 2017-11-29 19:50:02 +07:00
Rémi Verschelde 39981b3c49
Merge pull request #13388 from rraallvv/refactor_2.1
Add target helper functions and refactor (2.1)
2017-11-29 08:55:10 +01:00
Rhody Lugo 714e02c0f6 disable caching for targets using helper functions 2017-11-28 16:14:24 -04:00
Rémi Verschelde b0b1e2e99e
Merge pull request #13360 from rraallvv/cache_pruning_2.1
Fixes for SCons shared cache for Travis-CI and AppVeyor-CI (2.1)
2017-11-28 09:17:27 +01:00
Rhody Lugo 388249c386 use the same cache for all branches for appveyor 2017-11-28 03:23:51 -04:00
Rémi Verschelde 48ca47b4ea
Merge pull request #13329 from rraallvv/cache_pruning_2.1
Enable pruning for SCons shared cache (2.1)
2017-11-27 07:57:19 +01:00
Rhody Lugo 88d836c95d prune scons shared cache 2017-11-27 01:24:56 -04:00
Rémi Verschelde 00b7295af5
Merge pull request #13304 from rraallvv/scons_cache_travis_2.1
Enable SCons shared cache for Travis CI (2.1)
2017-11-26 15:56:59 +01:00
Rhody Lugo e1d43b3bef add support for scons cache and enable it for travis 2017-11-26 10:26:11 -04:00
Rémi Verschelde aad6ef9423
Merge pull request #13300 from rraallvv/scons_cache_2.1
Enable SCons shared cache for AppVeyor CI (2.1)
2017-11-26 15:09:10 +01:00
Rhody Lugo 8e8a7aba8c add support for scons cache and enable it for appveyor 2017-11-25 22:16:03 -04:00
George Marques 517f520f64
Merge pull request #13122 from sersoong/2.1-test2
[2.1] - Change script list menu item to shortcut and add more item
2017-11-21 12:45:37 -02:00
sersoong 1cf15bb847 Change script list menu item to shortcut and add more item 2017-11-21 08:02:01 +08:00
Rémi Verschelde deb360f4f5
Merge pull request #13112 from DmitryKrutskikh/view-fps-2-1
[2.1] Add "View FPS" in 3D->Perspective's popup.
2017-11-21 00:10:31 +01:00
Rémi Verschelde 9deae6e45d
Merge pull request #12506 from sanikoyes/pr-2.1-extends-enhance
Allow to extends constant class variable
2017-11-20 23:25:36 +01:00
Dmitry Krutskikh da1b3bfdcb Add "View FPS" in 3D->Perspective's popup. 2017-11-20 23:09:09 +03:00
Rémi Verschelde cf13e05d46
Merge pull request #12945 from sersoong/2.1-test
2.1 - Add open scene feature to dependency_editor.cpp
2017-11-20 09:12:17 +01:00
Rémi Verschelde 28f2e5483e
Merge pull request #12985 from sersoong/2.1-test2
[2.1]-Add Close All,Close Others Options to script editor
2017-11-20 09:00:49 +01:00
Rémi Verschelde f32497929b
Merge pull request #13067 from sersoong/2.1-test3
[2.1] - Fix TextureRegionEditor's snap mode is not initial bug.
2017-11-20 08:02:27 +01:00
sersoong 19d2ba2b08 Fix TextureRegionEditor's snap mode is not initial bug. 2017-11-20 09:15:49 +08:00
Rémi Verschelde 23e17e6ed2
Merge pull request #13029 from sersoong/2.1-test3
[2.1] - porting 3.0 filesystem dock context menu to 2.1
2017-11-19 21:57:15 +01:00
sersoong 320ee1851f Porting 3.0 filessytem_dock's context menu to 2.1 2017-11-19 11:21:36 +08:00
George Marques fa000c6327
Fix build error caused by cherry-pick from 3.0
Problematic commit: 5e4f092ac
2017-11-17 20:54:35 -02:00
Rémi Verschelde 52da15b6fc
Merge pull request #12994 from vnen/plugin-resource-save
Make resources edited by plugins be sent as reference (2.1)
2017-11-17 19:48:51 +01:00
George Marques 5e4f092acd
Make resources edited by plugins be sent as reference
This ensures that a plugin can save a resource using the ResourceSaver.
2017-11-17 16:43:51 -02:00
sersoong 88b5287731 Add Close All,Close Other Tabs to script editor 2017-11-17 21:42:01 +08:00
Rémi Verschelde e132adf49f
Merge pull request #12607 from rraallvv/window_position_2.1
Fix window position on macOS (2.1)
2017-11-17 00:36:24 +01:00
Rémi Verschelde 980f5b36a4
Merge pull request #12947 from volzhs/remove-printline
Remove print spam when using encrypted script

[ci skip]
2017-11-15 12:44:04 +01:00
volzhs 28dfd82734 Remove print spam when using encrypted script 2017-11-15 20:37:57 +09:00
sersoong 886aac981c Add open scene feature to dependency_editor.cpp 2017-11-15 15:50:32 +08:00
Rhody Lugo 75925198be fix window position computations on macOS 2017-11-14 08:59:50 -04:00
Rémi Verschelde fbb0732a36
Merge pull request #12889 from sersoong/2.1-test
2.1-Add gdscript multiple template and 'template' OptionButton in Script_Create_Dialog.cpp
2017-11-14 08:13:19 +01:00
Rémi Verschelde ff69d1fff2
Merge pull request #12886 from rraallvv/osx_android_travis_2.1
travis: caching Android, iOS, macOS (cross-compile) (2.1)
2017-11-13 21:44:45 +01:00
Rhody Lugo f09bbfa372 change matrix and enable caching for Android, iOS and macOS (cross-compile) 2017-11-13 15:13:46 -04:00
sersoong 875fd90467 Add more template to Script_Create_dialog.cpp 2017-11-13 14:31:51 +08:00
Rémi Verschelde aafb06cf9f
Merge pull request #12820 from eska014/2.1-html5-pointer-input
Backport HTML5 pointer-input patches to 2.1
2017-11-12 20:28:35 +01:00
Leon Krause b717d1dc4c Implement HTML5 touch events
(cherry picked from commit 86f5ac3d74)
2017-11-10 20:54:58 +01:00
Leon Krause 9b07e32656 Reimplement HTML5 mouse input without GLUT
Fixes inverted scrolling on Chromium

(cherry picked from commit a99b6b2063)
2017-11-10 20:51:16 +01:00
Rémi Verschelde 55c010aa61
Merge pull request #11837 from Listwon/FixEditorTooltips
Fix "enable_object_picking" disables editor tooltips
2017-11-10 10:57:53 +01:00
Rémi Verschelde 49a12ddbc5
Merge pull request #12748 from rraallvv/unified_headers_fix_2.1
unified headers fix (2.1)
2017-11-09 16:40:14 +01:00
Rhody Lugo fd10b1cf4c unified headers fix 2017-11-09 09:47:28 -04:00