maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6521 commits 10 branches 35 tags 1.1 GiB
Commit graph

6521 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde
b3a1821b46
Merge pull request #14495 from RandomShaper/fix-mouse-x11-2.1 
Fix no mouse if touch device present in X11 (2.1)
 2017-12-10 11:43:15 +01:00
Pedro J. Estébanez
088569fe14 Fix no mouse if touch device present in X11 
Plus several improvements in this area.

Sadly, grabbing has been disabled until a better solution is found.
 2017-12-10 07:15:07 +01:00
Rémi Verschelde
78364d4b07
Merge pull request #14355 from volzhs/ios-delegate 
use application:didFinishLaunchingWithOptions: instead of application…
 2017-12-07 09:33:25 +01:00
Rémi Verschelde
67ea819dc9 Travis: Disable OSX builds, they create too much backlog 
Travis CI has not enough OSX build nodes allocated for open source projects,
so we often have to wait several hours (up to a full day) for builds to start.

(cherry picked from commit e0c00efb99)
 2017-12-07 07:44:56 +01:00
Rémi Verschelde
20482cd5a4
Merge pull request #14354 from sersoong/2.1-addopenall 
Enhanced 'open' in filesystemdock and fixed some non clang-format style code
 2017-12-07 07:38:03 +01:00
MrCdK
1cda47a7bc Fix windows compilation when using MinGW 
(cherry picked from commit 651677f033)
 2017-12-07 07:30:22 +01:00
Rémi Verschelde
0f4c05cc89 Travis: Install libxi-dev after #14347 
(cherry picked from commit f674a55f3a)
 2017-12-07 07:28:56 +01:00
Rémi Verschelde
7b97ef5d3c
Merge pull request #14346 from RandomShaper/adpod-mt-2.1 
Implement multitouch on X11 and improve it on Windows (2.1)
 2017-12-07 07:28:36 +01:00
volzhs
d25b1cf88a use application:didFinishLaunchingWithOptions: instead of applicationDidFinishLaunching: for iOS 2017-12-07 10:02:19 +09:00
sersoong
97c80f84ca Enhanced 'open' in filesystemdock and fixed some non clang-format code 2017-12-07 08:36:33 +08:00
Pedro J. Estébanez
838fd94a70 Remove dead code from Windows build script 2017-12-07 00:00:24 +01:00
Pedro J. Estébanez
a6cedd736b Add build param for targeted Windows version 2017-12-07 00:00:24 +01:00
Pedro J. Estébanez
cb23cc1ca4 Improve/fix multitouch on Windows 
- Fix logic error.
- Track touches to enable defensive handling and releasing on focus out.
- Change comment-out by preprocessor `#if`.
 2017-12-07 00:00:24 +01:00
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
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