Nuno Donato
7496b2f862
Added "Scots" locale name, fixing #7630
...
(cherry picked from commit 6b5c595e40
)
2017-02-08 16:18:59 +01:00
Rémi Verschelde
9e3f063e99
Revert "Fixes #7630 Hint was be appending for every language. Changed to only fill hint with the matching language."
...
This reverts commit b6468db118
,
the bug will be properly fixed by the cherry-pick of 6b5c595
.
2017-02-08 16:18:22 +01:00
Rémi Verschelde
be0350704f
Merge pull request #7711 from williamd1k0/cherrypick-colorframe
...
Add ColorFrame control (2.1)
2017-02-07 14:16:47 +01:00
William Tumeo
f3bc5d443c
Add ColorFrame control (2.1)
...
- cherry-pick from 95eb7466df
2017-02-02 18:22:03 -02:00
Rémi Verschelde
34b6caa433
Merge pull request #7678 from volzhs/fix-save-branch
...
Fix crash when saving root node by "Save Branch as Scene" with unsaved scene
2017-02-02 08:15:28 +01:00
Rémi Verschelde
6a01cf96b2
Merge pull request #7671 from RandomShaper/load-placeholder-dup-2.1
...
Replicate load-as-placeholder state on node duplication (2.1)
2017-02-02 08:14:02 +01:00
Rémi Verschelde
1d0997b01e
Merge pull request #7660 from zombieCraig/translationfix
...
Fixes #7630 Editor Translation Import Crash fix
2017-02-02 08:11:39 +01:00
Rémi Verschelde
bd71020354
Merge pull request #7651 from leezh/collada_import_tweaks
...
Re-Implemented Texture Actions for Scene Import (2.1 Branch)
2017-02-02 08:10:10 +01:00
Rémi Verschelde
6b1d33ec71
Merge pull request #7650 from pkowal1982/fix_7011
...
Fix #7011 ScrollContainer takes into account child's EXPAND flag when scrolling is enabled
2017-02-02 08:09:09 +01:00
Rémi Verschelde
4a73e74ccb
Merge pull request #7641 from RandomShaper/touch-button-shape
...
Touch button shape (2.1)
2017-02-02 08:05:26 +01:00
volzhs
43a2599801
Fix crash when saving root node by "Save Branch as Scene" with unsaved scene
...
Fix #7667
2017-01-30 07:00:03 +09:00
Pedro J. Estébanez
936f2e3b4e
Replicate load-as-placeholder state on node duplication (2.1)
2017-01-29 11:50:42 +01:00
Craig Smith
b6468db118
Fixes #7630 Hint was be appending for every language. Changed to only fill hint with the matching language.
2017-01-27 22:43:44 -08:00
Pawel Kowal
e9316a009e
Fix #7011 ScrollContainer takes into account child's EXPAND flag when scrolling is enabled
2017-01-26 10:02:19 +01:00
Zher Huei Lee
f3b32746de
Re-Implemented Texture Actions for Scene Import
...
Moved the shared_textures config to the editor category so that it would
be visible in the project settings window again. Fixes #7579
Added option to import textures to the same folder as the source
textures, or to reuse the files without re-importing (flags may need to
be applied manually).
2017-01-26 16:44:27 +08:00
Rémi Verschelde
cdb0be8eed
Merge pull request #7646 from RandomShaper/vcs-friendliness-2.1
...
Improve .tscn VCS (2.1)
2017-01-25 20:56:17 +01:00
Rémi Verschelde
ad899a0dd9
Merge pull request #7639 from volzhs/fix-scrollbar-2d-editor-2.1
...
Fix weird scrollbar appearance on 2D editor (2.1)
2017-01-25 20:39:45 +01:00
Pedro J. Estébanez
888f8b31e7
Improve .tscn VCS
...
Serialize dictionaries adding newlines between key-value pairs
Serialize group lists also with newlines in between
Serialize string properties escaping only " and \ (needed for a good diff experience with built-in scripts and shaders)
Bonus:
Make AnimationPlayer serialize its blend times always sorted so their order is predictable in the .tscn file.
This PR is back-compat; won't break the load of existing files.
Cherry-picked from 7dbb1c0571
2017-01-25 20:11:10 +01:00
Pedro J. Estébanez
67a0da34a2
Add shape property to TouchScreenButton
2017-01-25 17:06:06 +01:00
volzhs
5b2c31a18a
Fix weird scrollbar appearance on 2D editor (2.1)
2017-01-25 23:34:41 +09:00
Rémi Verschelde
9038a96e49
Merge pull request #7632 from RandomShaper/hide-lock-icons-2.1
...
2D Editor: Don't show lock icons for hidden nodes (2.1)
2017-01-25 07:38:16 +01:00
Rémi Verschelde
e4efab04bb
Merge pull request #7634 from RandomShaper/fs-split-layout-2.1
...
Include filesystem dock split offset in editor layouts (2.1)
2017-01-25 07:37:45 +01:00
Pedro J. Estébanez
2ac89f6540
Include filesystem dock split offset in editor layouts
2017-01-25 02:46:44 +01:00
Andreas Haas
8f11304dfc
2D Editor: Don't show lock icons for hidden nodes.
...
Now we only draw those icons for visible Nodes.
Fixes #7518
Cherry-picked/adapted from a043ce7304
2017-01-25 00:58:14 +01:00
Rémi Verschelde
6549733aa7
Merge pull request #7625 from RandomShaper/fix-android-module-res
...
Fix resources for Android modules not being merged (2.1)
2017-01-25 00:04:40 +01:00
Pedro J. Estébanez
fec41c528c
Fix resources for Android modules not being merged
...
Fixes #7421
2017-01-24 16:29:09 +01:00
Rémi Verschelde
c508b5b2e1
Release 2.1.2-stable
2017-01-21 14:43:37 +01:00
Rémi Verschelde
b65e553440
classref: Sync with current source
2017-01-21 14:06:17 +01:00
Rémi Verschelde
7c47769aa2
Remove Quick Filter Files and fix FS search hotkey
...
The new Quick Filter Files behaviour since 8b47e26
had not been implemented,
so this implements it and makes it an editor hotkey instead of a menu entry.
Fixes #7582 .
(cherry picked from commit c4d6e54e93
)
2017-01-21 13:44:27 +01:00
Rémi Verschelde
0669c9816e
Merge pull request #7557 from RandomShaper/ordered-image-group-files-2.1
...
Make image-groups map in export.cfg ordered (2.1)
2017-01-16 21:05:28 +01:00
Rémi Verschelde
23789f49dd
Merge pull request #7561 from eska014/web-presentation-2.1
...
Cherry-pick usability fixes in web export presentation
[ci skip]
2017-01-16 20:13:19 +01:00
Pedro J. Estébanez
8e380677cb
Make image-groups map in export.cfg ordered
...
This improves the VCS experience because otherwise they change their order everytime producing spurious changes.
2017-01-16 19:00:48 +01:00
eska
e4bbc1067a
Improve usability in web export presentation
...
- Make canvas support check message visible
- Make it obvious status can be closed by clicking
- Don't use status to display non-critical errors
- Fix setting total memory
(cherry picked from commit 1f7d4c4d0e
)
2017-01-16 18:39:04 +01:00
Rémi Verschelde
5aac8eeb0f
Merge pull request #7549 from RandomShaper/cp-usability-2.1
...
Cherry-pick node creation usability enhancements (2.1)
2017-01-16 18:05:56 +01:00
Rémi Verschelde
b351d4cbc1
zlib: Update to upstream version 1.2.11
...
(cherry picked from commit 6a3dae5be9
)
2017-01-16 17:58:43 +01:00
Rémi Verschelde
1f2293d5cc
Merge pull request #7554 from Faless/2.1-tcp-winfix
...
2.1.x - Fix bug in windows TCP poll function
2017-01-16 16:00:27 +01:00
Fabio Alessandrelli
8322c1aa64
Fix bug in windows TCP poll function
...
Bug introduced when implementing TCP disconnection detection.
(too much yank-paste).
Fixes #7545
(cherry picked from commit c356ec5e8b
)
2017-01-16 15:51:43 +01:00
Pedro J. Estébanez
8fca6870c4
Added favorites and recent history to create dialog
...
Cherry-picked from 8d785812351a0a3eca88214f2436bb7574d55873 and 827a9aa829
2017-01-16 12:38:46 +01:00
Juan Linietsky
9f3c594f9e
Making bits of docs appear in different dialogues is made easier with EditorHelpBit
2017-01-16 11:56:00 +01:00
Pedro J. Estébanez
b3d0596c4b
Add EditorNode::set_visible_editor()
...
Cherry-picked from d8af6330e5
2017-01-16 11:56:00 +01:00
Rémi Verschelde
6b5a852bd8
Merge pull request #7522 from Faless/2.1-split
...
2.1.x Cherry pick patch to enable 2D split screen. ( #6486 )
2017-01-16 10:11:39 +01:00
Juan Linietsky
25a62a3e32
Added a few functions to make 2D split screen easier.
...
(cherry picked from commit a4156f1f0a
)
2017-01-12 20:53:03 +01:00
Fabio Alessandrelli
b61d7e6261
Restore viewport set_world_2d functionality
...
(cherry picked from commit 97cf3eba56
)
2017-01-12 19:44:22 +01:00
Fabio Alessandrelli
9c8ecb45f8
Improvements to scons defined WINVER/_WIN32_WINNT
...
(cherry picked from commit 65483d57bf
)
2017-01-12 19:15:30 +01:00
Ignacio Etcheverry
8a5596322d
Detect bits when building with MinGW
...
(cherry picked from commit 460f030b73
)
2017-01-12 19:15:30 +01:00
Rémi Verschelde
93a83c81f0
Windows: Workaround missing includes in MinGW-w64 < 4
...
The MinGW-w64 version we have on our Travis build environment (Ubuntu 12.04,
mingw-w64 2.0.1, gcc 4.6) is old and has some missing includes in the
dependencies of the `tcpmib.h` header [0] [1] [2].
Those were not triggered before 6323779596
probably due to conflicting WINVER definitions which prevented triggering the code
specific to >= 0x0600 (Vista). We ensure it won't be triggered by defining the
_WIN32_WINNT macro to Windows XP compatibility.
(cherry picked from commit b24fe6879a
)
2017-01-12 19:15:30 +01:00
Rémi Verschelde
af7fd899f4
opus: Update to upstream opusfile 0.8
...
Had missed it in the previous commit as the upstream website is outdated.
(cherry picked from commit c2310b41fa
)
2017-01-12 19:15:30 +01:00
Rémi Verschelde
d66740175e
Windows: Define _WIN32_WINRT to 0x0600 (Vista)
...
Passed as a compiler define to be sure it is always define before windows.h
is loaded. This means that Godot officially requires Vista API or later, it will
not work on Windows XP or earlier.
Also fix a bogus check for Windows 7 API.
(cherry picked from commit 6323779596
)
2017-01-12 19:15:30 +01:00
Rémi Verschelde
5672852351
x11: Improve logic for cross-dependencies between freetype, zlib and libpng
...
Fixes #7373 .
(cherry picked from commit d945c4e58e
)
2017-01-12 19:15:30 +01:00
Rémi Verschelde
349e62835b
i18n: Add support for Scots (sco) language
...
Fixes #6931 .
(cherry picked from commit ede36aca8d
)
2017-01-12 19:15:30 +01:00