Commit Graph

18327 Commits

Author SHA1 Message Date
Rémi Verschelde d8067e905c
Merge pull request #24500 from akien-mga/drop-global_defaults
Core: Drop unused global_defaults logic
2018-12-20 11:49:32 +01:00
Rémi Verschelde a8faa55042
Merge pull request #24485 from volzhs/system-time-ms
Added OS.get_system_time_msecs()
2018-12-20 11:31:16 +01:00
Rémi Verschelde 9cb18232c2 Core: Drop unused global_defaults logic
It used to be used for Android and iOS to specify platform-specific
project settings overrides, but we now have feature tags for that.
2018-12-20 11:02:49 +01:00
volzhs 84d060c768 Added OS.get_system_time_msecs() 2018-12-20 18:50:50 +09:00
Rémi Verschelde b3f6e54cc6 Style: Fix formatting in GLES2 shaders 2018-12-20 10:33:48 +01:00
Rémi Verschelde 1a2fc40f86
Merge pull request #24495 from vipsbpig/pr-fix-gles2-spotlight
Fix GLES2 Spotlight shadow problem
2018-12-20 10:08:23 +01:00
Rémi Verschelde 45f1cdb0b7
Merge pull request #24481 from vnen/android-export-debug-keystore
Add option to add debug keystore in Android export
2018-12-20 09:42:34 +01:00
Gitea 9f48094982 fix gles2 spotlight problem 2018-12-20 15:01:59 +08:00
Rémi Verschelde e8cdbf99e9 CodeEditor: Drop unused enable_complete_timer variable
Its use was removed in 1039ba9ffb.
2018-12-19 20:31:55 +01:00
George Marques e3e5a1bb6e Add option to add debug keystore in Android export 2018-12-19 15:09:09 -02:00
Juan Linietsky aa819a8538 Properly support light shaders in GLES2, fixes #21651 2018-12-19 10:25:45 -03:00
Rémi Verschelde a06f8ca6b9
Merge pull request #24439 from staalduinen/mouse-motion-fix
fix near infinite loop when no previous mouse position
2018-12-19 14:09:24 +01:00
Arjen van Staalduinen ef9313f415 fix near infinite loop when no previous mouse position
Added physics_has_last_mousepos to better deal with
situations where there is no last_mousepos
2018-12-19 13:35:41 +01:00
Rémi Verschelde 26058376aa
Merge pull request #24462 from guilhermefelipecgs/fix_copy_paste_tilemap
Fix copy/paste for TileMap
2018-12-19 08:43:52 +01:00
Guilherme Felipe 06a929ace7 Fix copy/paste for TileMap
Fix #24440
2018-12-18 22:48:59 -02:00
Rémi Verschelde c6edc435f4
Merge pull request #24457 from volzhs/colored-font-size
Fix colored font rendered in wrong size
2018-12-19 00:15:03 +01:00
Juan Linietsky bec76cfa19 Change how rects are drawn (and also will help batching eventually), to workaround problem in #9913 2018-12-18 17:50:35 -03:00
volzhs e577093965 Fix colored font rendered in wrong size
Fix #24456

The character->rect.size is properly update at DynamicFontAtSize::_bitmap_to_character
so no need to multiply scale again.

It was changed with 5cd12f6649
2018-12-19 03:54:51 +09:00
Rémi Verschelde 3c999ae1a1
Merge pull request #24451 from mateusfccp/animation_editor_curve_tangent_different_color
Change color of AnimationPlayer curve to "highlight"
2018-12-18 18:56:05 +01:00
Rémi Verschelde c4cc66596e
Merge pull request #24454 from YeldhamDev/animationtree_editor_small_fixes
Small fixes for the AnimationTree editor
2018-12-18 18:54:12 +01:00
Michael Alexsander Silva Dias 2b278a5336 Small fixes for the AnimationTree editor 2018-12-18 15:24:22 -02:00
Juan Linietsky 89abfd40ed Reduce considerably the cubemap sizes on sky, to better match GLES3, fixes #21551 2018-12-18 13:01:46 -03:00
Juan Linietsky 85d44dd7b6 Actually respect the low quality cubemap filter on mobile, should fix crashes on mobile for #21551 but not sure on intel. 2018-12-18 12:52:50 -03:00
Mateus Felipe C. C. Pinto e7968954e8 Change color of AnimationPlayer curve to "highlight"
This is to be consistent with Curve editor and to be less confusing
related to tangent lines color.
2018-12-18 13:46:03 -02:00
Rémi Verschelde e3241d5461
Merge pull request #24450 from staalduinen/fix-zlib-freetype-conflict
Disable gzip and lzw support for freetype
2018-12-18 15:59:06 +01:00
Arjen van Staalduinen c3c7ac0953 Disable gzip and lzw support for freetype
This resolves #24287 that causes linking issues when using the debug target for platform iOS.
2018-12-18 15:42:25 +01:00
Rémi Verschelde 402e4b817e
Merge pull request #24447 from Paulb23/text_edit_wrap_crash
Fix Word wrap cache desync causing crash
2018-12-18 14:45:12 +01:00
Paulb23 f1c6947702 Fix Word wrap cache desync causing crash 2018-12-18 13:12:46 +00:00
Rémi Verschelde 1039ba9ffb EditorSettings: Remove enable_code_completion_delay
It was badly named (it disables code completion, not just the delay), and also
badly implemented (not preventing the timer for running, but just preventing it
to show the autocompletion).

It could be readded with a proper name and cleaner implementation if there's an
actual need for it.

Supersedes #24407 and closes #24352.
2018-12-18 10:06:38 +01:00
Rémi Verschelde 0a2f99684b
Merge pull request #24408 from creikey/master
Clarify what popup_centered actually does
2018-12-18 10:02:16 +01:00
Rémi Verschelde df78e8078e
Merge pull request #24145 from volzhs/android-version-gradle
Fix error/warning while building with android studio
2018-12-18 09:41:23 +01:00
Rémi Verschelde 830232f130
Merge pull request #23615 from buresu/pluginscript-new
PluginScript: Add support for the new() method
2018-12-18 09:29:04 +01:00
volzhs b385a4b053 Fix lint error/warning while building android template 2018-12-18 17:26:33 +09:00
Rémi Verschelde 1621270f26
Merge pull request #24432 from YeldhamDev/animationtree_editor_fixes
General fixes for the AnimationTree editor
2018-12-18 09:08:10 +01:00
Rémi Verschelde 75c6ad9756
Merge pull request #24427 from guilhermefelipecgs/fix_bread_crumb
Fix bread crumb of AnimationTree
2018-12-18 09:06:57 +01:00
Rémi Verschelde 8af4ce9832
Merge pull request #24436 from YeldhamDev/animationtree_editor_better_path
Make the AnimationTree editor's path section more obvious
2018-12-18 09:05:34 +01:00
Rémi Verschelde a195b2f1a3
Merge pull request #24428 from akien-mga/label-uppercase
Label: Fix kerning when using Uppercase mode
2018-12-18 07:57:41 +01:00
Rémi Verschelde 535cb52558
Merge pull request #24431 from mateusfccp/master
Change *_slot to *_port on get_connection_list
2018-12-18 07:42:39 +01:00
Michael Alexsander Silva Dias 3c9ce2406b Make the AnimationTree editor's path section more obvious 2018-12-17 23:52:14 -02:00
Michael Alexsander Silva Dias b86b497cec General fixes for the AnimationTree editor 2018-12-17 21:03:58 -02:00
Mateus Felipe C. C. Pinto 6bb0439ce3
Change *_slot to *_port on get_connection_list 2018-12-17 21:00:39 -02:00
Hein-Pieter van Braam 0cff752be1
Merge pull request #24430 from hpvb/fix-24424
Don't accidentally convert string content to char
2018-12-17 22:46:49 +01:00
Hein-Pieter van Braam c58b1608ea Don't accidentally convert string content to char
Due to the right hand side of the :? trickery the rhs was cast to a
char losing precision. Previously this didn't matter, but with
CharProxy it does. (Previously we could just happily cast it back to
a wchar_t and get the original 16 - 32 bits. Now we'll only ever
get the first 8).
2018-12-17 22:31:02 +01:00
Rémi Verschelde 7cb5e005ee Label: Fix kerning when using Uppercase mode
Seemingly a typo, I did not check what exact impact it had, but
the x_ofs would likely have accumulated errors when using fonts
with varying char widths.
2018-12-17 20:56:36 +01:00
Guilherme Felipe 317561863d Fix bread crumb of AnimationTree 2018-12-17 17:08:41 -02:00
Rémi Verschelde cf0716952d
Merge pull request #24422 from guilhermefelipecgs/fix_z_index_atlas
Add z-index to ATLAS_TILE
2018-12-17 13:57:23 +01:00
Guilherme Felipe d840262739 Add z-index to ATLAS_TILE 2018-12-17 10:03:50 -02:00
Rémi Verschelde 4d546164e7 Fix maybe-uninitialized warnings from GCC 4.8.x
Fixes the following warnings in `p=server target=release_debug` builds
on Travis CI:
```
./core/os/memory.h: In function 'MainLoop* TestOAHashMap::test()':
./core/os/memory.h:108:111: warning: 'dummy' may be used uninitialized in this function [-Wmaybe-uninitialized]
 #define memnew_placement(m_placement, m_class) _post_initialize(new (m_placement, sizeof(m_class), "") m_class)
                                                                                                               ^
main/tests/test_oa_hash_map.cpp:98:7: note: 'dummy' was declared here
   int dummy;
       ^

scene/resources/bit_mask.cpp:447:3: warning: 'next_i' may be used uninitialized in this function [-Wmaybe-uninitialized]
scene/resources/bit_mask.cpp:448:4: warning: 'next_j' may be used uninitialized in this function [-Wmaybe-uninitialized]
```
2018-12-17 12:42:26 +01:00
Rémi Verschelde 28b10ea668 Fix sometimes uninitialized variable warning raised by Xcode 9.4.1
Fixes this warning raised by Travis CI on macOS:
```
editor/plugins/polygon_2d_editor_plugin.cpp:95:6: warning: variable 'skeleton' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
        if (!node->has_node(node->get_skeleton())) {
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
editor/plugins/polygon_2d_editor_plugin.cpp:106:7: note: uninitialized use occurs here
        if (!skeleton) {
             ^~~~~~~~
editor/plugins/polygon_2d_editor_plugin.cpp:95:2: note: remove the 'if' if its condition is always false
        if (!node->has_node(node->get_skeleton())) {
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
editor/plugins/polygon_2d_editor_plugin.cpp:94:22: note: initialize the variable 'skeleton' to silence this warning
        Skeleton2D *skeleton;
                            ^
                             = NULL
```
2018-12-17 12:28:11 +01:00
Rémi Verschelde 4b6e7b50b9
Merge pull request #24411 from guilhermefelipecgs/fix_22389
Fix sub-transitions not using end_node correctly
2018-12-17 08:11:48 +01:00