Rémi Verschelde
8312d421c6
Move core thirdparty files to thirdparty/{minizip,misc}
...
(cherry picked from commit 2398eb6ed4
)
2017-05-26 23:29:26 +02:00
Ferenc Arn
1b25762c3d
Detect SSE/SSE2 for libsquish.
...
(cherry picked from commit b6259661ce
)
2017-05-26 19:12:40 +02:00
Rémi Verschelde
e43e7a414a
Fix theme_data.h formatting via make_header.py
...
Should make clang-format happy.
(cherry picked from commit 5f15f03d38
)
2017-05-26 19:11:43 +02:00
Andreas Haas
66a1e049b0
Tree: Ability to add tooltips to TreeItem buttons.
...
Adds a tooltip parameter to `TreeItem::add_button()` and set a few tooltips in the Project settings and SceneTree dock.
(cherry picked from commit 29999942a2
)
2017-05-26 19:05:09 +02:00
clayjohn
831c8cb325
added documentation for SurfaceTool
...
(cherry picked from commit 478817abad
)
2017-05-26 18:56:14 +02:00
clayjohn
c5db548d2a
added descriptions for WorldEnvironment node in documentation
...
(cherry picked from commit 5fdc7ac88a
)
2017-05-26 18:54:22 +02:00
Karroffel
e151b66127
fixed a bug where saving a GDScript file crashed the editor
...
I changed the loop in #8502 , turns out it fixed the error I was facing but introduced a new one. This fixes both
(cherry picked from commit 67886bab1e
)
2017-05-26 18:53:28 +02:00
Marco Melorio
3d7756df8e
Added a container to EditorNameDialog
...
(cherry picked from commit d4082a8d92
)
2017-05-26 18:47:32 +02:00
Marco Melorio
b0d2b46efb
Update snake_case splitting
...
(cherry picked from commit 4677c0fbb8
)
2017-05-26 18:47:23 +02:00
Rémi Verschelde
fec8e2549c
Fix a few property warnings on Globals access
...
Hand-picked from 515f92d03b
.
2017-05-26 18:46:59 +02:00
Rémi Verschelde
9b1ee4cd66
i18n: Add more assetlib strings to translate
...
Fixes #8463 .
(cherry picked from commit b474646de0
)
2017-05-26 18:41:46 +02:00
Ramesh Ravone
22c174bb71
Android: avoiding duplicates in build.gradle
...
(cherry picked from commit f8309f86c2
)
2017-05-26 18:08:59 +02:00
Ramesh Ravone
9028a75452
Android: Support to change minSdkVersion ( #8313 )
...
(cherry picked from commit 93b417fe17
)
2017-05-26 18:08:26 +02:00
Ray Koopa
134d87a338
Ignore .vs folder, fix .vscode comment
...
(cherry picked from commit ac6ef54500
)
2017-05-26 18:08:02 +02:00
Andreas Haas
18f2b96186
Fix warning message when EditorPlugin script is not in tool mode.
...
(cherry picked from commit 0029440955
)
2017-05-26 18:07:25 +02:00
supaiku
fda4911b6e
Fix highlight typo
...
(cherry picked from commit d51fe99a8b
)
2017-05-26 17:43:18 +02:00
Andreas Haas
a46dcfe12f
Core: fix possible memory leaks.
...
(cherry picked from commit a2734df7ed
)
2017-05-26 17:38:05 +02:00
curtisxk38
5a1bcae6c2
Fix typo in Parser Error message
...
(cherry picked from commit d35fab7382
)
2017-05-26 17:37:46 +02:00
Rémi Verschelde
9391641356
Fix URLs to moved docs pages
...
Closes #8266 .
(cherry picked from commit 4989cc3617
)
2017-05-26 17:36:43 +02:00
Rémi Verschelde
99f65fcb4f
Merge pull request #8922 from volzhs/fix-android-build
...
Fix android build regression by 69c4c4a
2017-05-26 16:00:50 +02:00
volzhs
c6ebb6a40c
Fix android build regression by 69c4c4a
2017-05-26 20:42:36 +09:00
Rémi Verschelde
29c7118f32
Merge pull request #8913 from RandomShaper/ios-alert-2.1
...
Implement OS.alert() for iOS (2.1)
2017-05-26 07:56:24 +02:00
Pedro J. Estébanez
b870ff6940
Implement OS.alert() for iOS
2017-05-25 17:30:36 +02:00
Rémi Verschelde
e65d7a0df7
Merge pull request #8787 from Zireael07/vehicle-improvements
...
Expose wheel's contact to GDScript and set roll influence in editor [2.1]
2017-05-22 07:50:37 +02:00
Rémi Verschelde
bd1c3b31a5
Merge pull request #8820 from zlsa/2.1
...
Export nested nodes in TileSet scenes; resolves #8819 .
2017-05-20 09:50:37 +02:00
Rémi Verschelde
2c5a4534f9
Merge pull request #8823 from volzhs/android-payment
...
Fix android payment logical error
2017-05-20 09:49:13 +02:00
Jon Ross
4ed2722589
Fix #8819 . Adds _import_node() that, when used in conjunction with _import_scene, recurses through the scene tree and exports all available nodes.
2017-05-19 14:01:28 -07:00
Zireael07
307c5c1afc
GDScript can now tell if the wheel is in contact with the ground; change roll influence of the wheel in editor
2017-05-19 11:50:23 +02:00
volzhs
d4ef6216d3
Fix android payment logical error
...
getting sku detail runs only if mod != 0 which means querying 20*n will not get sku details.
referenced from https://github.com/googlesamples/android-play-billing/blob/master/TrivialDrive/app/src/main/java/com/example/android/trivialdrivesample/util/IabHelper.java#L1029-L1062
2017-05-19 12:11:59 +09:00
Rémi Verschelde
06f77f941b
Merge pull request #8797 from RandomShaper/gdfs-ext-check-2.1
...
Add extended check option to GDFunctionState::is_valid() (2.1)
2017-05-18 18:51:13 +02:00
Rémi Verschelde
23fb7d29c2
Merge pull request #8808 from RandomShaper/mq-flush-reentrant-2.1
...
Make MessageQueue::flush() reentrant (2.1)
2017-05-18 18:49:41 +02:00
Pedro J. Estébanez
fa4b09f63d
Make MessageQueue::flush() reentrant
2017-05-18 13:01:12 +02:00
Pedro J. Estébanez
7b192313b3
Add extended check option to GDFunctionState::is_valid()
2017-05-17 14:47:17 +02:00
Rémi Verschelde
21bf3778d5
Merge pull request #8776 from RandomShaper/fix-sample-priority-2.1
...
Fix priority in sample players (2.1)
2017-05-16 08:12:52 +02:00
Rémi Verschelde
5436543122
Merge pull request #8779 from RandomShaper/updgrade-android-build-tools-2.1
...
Upgrade Android build tools to the latest (2.1)
2017-05-16 07:26:56 +02:00
Pedro J. Estébanez
deda04faff
Upgrade Android build tools to the latest
2017-05-16 00:54:54 +02:00
Pedro J. Estébanez
40e7f1c3d5
Fix priority in sample players
2017-05-15 20:24:38 +02:00
Rémi Verschelde
aa046a85dc
Merge pull request #8740 from pixelpicosean/scrollingWithFactor
...
Implemented scrolling factor for precision trackpads for 2.1
2017-05-15 07:57:05 +02:00
Rémi Verschelde
caeee17846
Merge pull request #8734 from Faless/various_2.1_cherries
...
Various 2.1 cherry picks
2017-05-15 07:55:27 +02:00
Sean Bohan
ee670f3724
Implemented scrolling factor for smooth trackpad scrolling
...
Working platforms platform: OSX, Windows.
Support for almost all ui elements, including project list.
Ported from 304a1f5b5a
(#7864 ).
Fixes #492 and #3913 .
2017-05-15 06:44:00 +08:00
Fabio Alessandrelli
3044d0aed3
Compression::compress properly returns compressed size
...
selective pick from cbbcf72703
2017-05-12 20:01:53 +02:00
Fabio Alessandrelli
aa167fa04b
Rename debug/debug_port to network/debug_port.
...
Expose it in editor settings.
2017-05-12 20:01:53 +02:00
Fabio Alessandrelli
7a4dc3be41
Allow selecting editor debug host and port.
...
Possibly fixes various editor<->debugger connection related problems.
(cherry picked from commit 98eb58a93c
)
2017-05-12 20:01:53 +02:00
Fabio Alessandrelli
baa175d7f8
Fix local ip addresses (interfaces) detection.
...
Ignore non-IP addresses for both windows and unix
(cherry picked from commit a1c41be569
)
2017-05-12 20:01:53 +02:00
Fabio Alessandrelli
0dc62633e6
Socket helpers now fall back to ipv4 on systems where ipv6 is disabled.
...
(cherry picked from commit 020f6a7f20
)
2017-05-12 20:01:53 +02:00
Fabio Alessandrelli
56e23624bf
Fix bug in pause mode propagation
...
Pause mode was not correctly propagating effectively stopping
immediately when the mode was not PAUSE_MODE_INHERIT.
(cherry picked from commit a5ce7a98cb
)
2017-05-12 20:01:53 +02:00
Fabio Alessandrelli
5521325068
Better explain out of memory error in message queue
...
Also effectively saves one unnecessary call when everything is fine.
(cherry picked from commit 1a7aafa90d
)
2017-05-12 20:01:53 +02:00
Fabio Alessandrelli
e9a7eeaf9c
Fix UDP wait() not returning after first received packet
...
(cherry picked from commit 5c6715a291
)
2017-05-12 20:01:53 +02:00
Fabio Alessandrelli
bd26eacc59
Allow non blocking UDP put_packet in C++.
...
- Add blocking mode option to PacketPeerUDP.
- put_packet returns ERR_UNAVAILABLE when operation would block.
- ENet module uses non-blocking UDP.
(cherry picked from commit 5f681d0b0f
)
2017-05-12 20:01:53 +02:00
Rémi Verschelde
e7328fe5a0
Fix return statement in CanvasItem::get_global_transform_with_canvas
...
Thanks to @susnux for the report and patch in #5446 .
2017-05-12 19:54:54 +02:00