Commit Graph

5468 Commits

Author SHA1 Message Date
Keetz 86c6aabf27 Fix scene tree drag & drop places node as child (#6912)
(cherry picked from commit 2afcbc4b1f)
2016-11-15 08:28:52 +01:00
Saracen e5f210693c Fixed flag for importing animation and skipping value tracks.
(cherry picked from commit 0063471edd)
2016-11-15 08:28:26 +01:00
Ignacio Etcheverry 7e3360ae01 Keep groups when replacing nodes
(cherry picked from commit 305956bf70)
2016-11-15 08:28:11 +01:00
Ariel Manzur 67f65f6639 memory ops implemented as OS functions by default 2016-11-08 19:04:56 -03:00
Ariel Manzur dbca4ee3fe adding get_stored_values method
changed order name
2016-11-08 18:14:10 -03:00
Rémi Verschelde cd828bd5fc server: Allow building against system libraries
(cherry picked from commit 5e360fe178)
2016-11-03 22:55:24 +01:00
Rémi Verschelde da4a870bc4 opus: Move public headers to match system install
(cherry picked from commit 611a94e3a6)
2016-11-03 21:22:56 +01:00
Rémi Verschelde ce54b6ea8b scons: Reorder options for clarity
Also prefix all thirdparty-related toggles with `builtin`.

(cherry picked from commit cc95d4448c)
2016-11-03 08:41:10 +01:00
Rémi Verschelde 5ee9a9962f libpng: Update to upstream 1.6.26
(cherry picked from commit 7504a85e5a)
2016-11-03 08:34:19 +01:00
Pedro J. Estébanez f629b1fd3e Improve Android build (Clang + tidyness)
(cherry picked from commit b18ff942be)
2016-11-02 22:34:17 +01:00
Rémi Verschelde eaf803f71e style: Various other PEP8 fixes in Python files
Done with `autopep8 --select=E7`, fixes:

- E701 - Put colon-separated compound statement on separate lines.
- E702 - Put semicolon-separated compound statement on separate lines.
- E703 - Put semicolon-separated compound statement on separate lines.
- E711 - Fix comparison with None.
- E712 - Fix (trivial case of) comparison with boolean.
- E713 - Fix (trivial case of) non-membership check.
- E721 - Fix various deprecated code (via lib2to3).
2016-11-02 22:30:34 +01:00
Rémi Verschelde a7389217f8 style: Fix PEP8 blank lines issues in Python files
Done with `autopep8 --select=E3,W3`, fixes:

- E301 - Add missing blank line.
- E302 - Add missing 2 blank lines.
- E303 - Remove extra blank lines.
- E304 - Remove blank line following function decorator.
- E309 - Add missing blank line.
- W391 - Remove trailing blank lines.
2016-11-02 22:29:36 +01:00
Rémi Verschelde e259bf8bbb style: Fix PEP8 whitespace issues in Python files
Done with `autopep8 --select=E2,W2`, fixes:

- E201 - Remove extraneous whitespace.
- E202 - Remove extraneous whitespace.
- E203 - Remove extraneous whitespace.
- E211 - Remove extraneous whitespace.
- E221 - Fix extraneous whitespace around keywords.
- E222 - Fix extraneous whitespace around keywords.
- E223 - Fix extraneous whitespace around keywords.
- E224 - Remove extraneous whitespace around operator.
- E225 - Fix missing whitespace around operator.
- E226 - Fix missing whitespace around operator.
- E227 - Fix missing whitespace around operator.
- E228 - Fix missing whitespace around operator.
- E231 - Add missing whitespace.
- E231 - Fix various deprecated code (via lib2to3).
- E241 - Fix extraneous whitespace around keywords.
- E242 - Remove extraneous whitespace around operator.
- E251 - Remove whitespace around parameter '=' sign.
- E261 - Fix spacing after comment hash.
- E262 - Fix spacing after comment hash.
- E265 - Format block comments.
- E271 - Fix extraneous whitespace around keywords.
- E272 - Fix extraneous whitespace around keywords.
- E273 - Fix extraneous whitespace around keywords.
- E274 - Fix extraneous whitespace around keywords.
- W291 - Remove trailing whitespace.
- W293 - Remove trailing whitespace.
2016-11-02 22:28:28 +01:00
Rémi Verschelde 561c1f17a1 style: Start applying PEP8 to Python files, indentation issues
Done with `autopep8 --select=E1`, fixes:

- E101 - Reindent all lines.
- E112 - Fix under-indented comments.
- E113 - Fix over-indented comments.
- E115 - Fix under-indented comments.
- E116 - Fix over-indented comments.
- E121 - Fix a badly indented line.
- E122 - Fix a badly indented line.
- E123 - Fix a badly indented line.
- E124 - Fix a badly indented line.
- E125 - Fix indentation undistinguish from the next logical line.
- E126 - Fix a badly indented line.
- E127 - Fix a badly indented line.
- E128 - Fix a badly indented line.
- E129 - Fix a badly indented line.
2016-11-02 22:26:55 +01:00
volzhs 7c92b401f1 Fix to fit stylebox with ItemList
(cherry picked from commit 4c9b00b508)
2016-11-02 22:18:34 +01:00
m4nu3lf d44e6ea268 Fixed Mix nodes in Animation Tree Player
(cherry picked from commit 40ba6d328b)
2016-11-02 22:18:28 +01:00
Rémi Verschelde 1185da656f Merge pull request #6988 from RandomShaper/2.1
Fix shader tokenizer/compiler reporting wrong error location (2.1)
2016-11-02 22:10:00 +01:00
Rémi Verschelde c78aef5812 Fix usage of 3.0 naming API in 1038c1f8 2016-10-31 08:39:45 +01:00
volzhs 91af714d39 Fix memory leak with drag & drop on 2D viewport
(cherry picked from commit a7d492eb53)
2016-10-31 07:55:23 +01:00
Andreas Haas 5033fc92f4 Ability to drag script files from Filesystem dock to SceneTree dock.
Allows to attach scripts by dragging them onto the target Node.

(cherry picked from commit a3944e66da)
2016-10-31 07:55:03 +01:00
volzhs 1038c1f856 Improve drag and drop on 2D viewport
(cherry picked from commit eed9179ea3)
2016-10-31 07:53:31 +01:00
Rémi Verschelde 8087be05c7 scons: msvc_is_detected not available in 2.1 2016-10-31 07:52:40 +01:00
Rémi Verschelde a20da0c048 classref: Sync with current sources 2016-10-31 00:15:54 +01:00
volzhs d67bbd183e Fix p_index out of size error when closing script
(cherry picked from commit 707185d9d8)
2016-10-31 00:07:56 +01:00
volzhs 647b287a1e Fix Accept/ConfirmationDialog UI broken
(cherry picked from commit 8d5644c4b2)
2016-10-31 00:07:47 +01:00
volzhs 91df1ebff6 Revert "Place child control under label in AcceptDialog."
This reverts commit 3ef2722904.

(cherry picked from commit 3f15a65307)
2016-10-31 00:07:40 +01:00
Rémi Verschelde 62d1e39113 scons: Move lib splitting method to methods.py
Apparently it might still be necessary for some console ports.

(cherry picked from commit e34a5324c8)
2016-10-31 00:07:29 +01:00
Pedro J. Estébanez b492dd78bd Adopt simpler strategy for big libs on Windows
(cherry picked from commit 51ad1c1668)
2016-10-31 00:05:42 +01:00
rdb a27aee241c Add "Never" underline mode to LinkButton
(cherry picked from commit d517bc908f)
2016-10-31 00:05:32 +01:00
Damon e3be51f87c Fix locale for macOS-style locales
(cherry picked from commit 1e7f078ce9)
2016-10-31 00:04:39 +01:00
Damon Myers 68b6b50d28 Change set_locale to fallback to the global language (#6910)
(cherry picked from commit 470ead74db)
2016-10-31 00:04:26 +01:00
volzhs 06c47e6f8a Remove dead code in FileSystemDock
(cherry picked from commit 9605a1d0da)
2016-10-31 00:02:12 +01:00
volzhs e56961f58b Fix comparison bug with InputEvent
(cherry picked from commit b76a0ca40c)
2016-10-31 00:02:04 +01:00
Błażej Szczygieł b0013f32bf "CCFLAGS" are for C and C++ compiler
(cherry picked from commit ace18d28d2)
2016-10-31 00:01:41 +01:00
Henrique Lacreta Alves 58daf901f9 Prevent unwanted script editor input on game crash
Fixes #6530.
(cherry picked from commit 853d1ce9f3)
2016-10-31 00:01:11 +01:00
Pedro J. Estébanez 887b1de1db Add/expose VisualServer::get_default_clear_color()
(cherry picked from commit 753ba67d65)
2016-10-31 00:00:55 +01:00
yg2f caf42f77d2 Fixes #6487, GDscript compiler ignores OPCODE_LINE and OPCODE_BREAKPOINT in Release mode
When godot is in release mode, GDscript compiler does not generate
bytecodes for OPCODE_LINE and OPCODE_BREAKPOINT anymore.

This optimizes GDscript execution speed when the script contains a lot
of comments in blocs executed in loops.

Fixes #6487

(cherry picked from commit 217e09c79d)
2016-10-31 00:00:46 +01:00
Karol Walasek 9f9d1eed7b Added general notes on RayCast[2D] updating behaviour and force_raycast_update()
(cherry picked from commit 8d57640d37)
2016-10-31 00:00:34 +01:00
Karol Walasek 0af331d1c0 Added force_raycast_update GDScript method for RayCast[2D]
(cherry picked from commit 7494a8c3c6)
2016-10-31 00:00:23 +01:00
George Marques 7a17d72e84 Fix extraneous NULL character on HTML export
Fix #2801

(cherry picked from commit 604ddd691c)
2016-10-30 23:58:41 +01:00
George Marques 52bf8bd168 Fix the hiding of mouse cursor before interaction
Fix part of #6633

(cherry picked from commit 414d58e6c0)
2016-10-30 23:58:32 +01:00
George Marques f3b42e049d Fix output binary paths for VS project generation
(cherry picked from commit c8093678a0)
2016-10-30 23:57:54 +01:00
Pedro J. Estébanez a130520a7c Fix shader tokenizer/compiler reporting wrong error location
Raname shader tokenizer methods for clarity
2016-10-30 22:09:23 +01:00
Błażej Szczygieł 85a7105345 SCons: Use colored output if available, change "colored"->"verbose"
(cherry picked from commit 2bf4553fe0)
2016-10-30 14:51:34 +01:00
Błażej Szczygieł dcd4b80c13 Disable asserts in release mode
(cherry picked from commit 639ea563e0)
2016-10-30 14:51:34 +01:00
Rémi Verschelde 5a49e45d21 SCsub: Add python shebang as a hint for syntax highlighting
Also switch existing shebangs to "better" /usr/bin/env python.

(cherry picked from commit fc8ccd5b8c)
2016-10-30 14:51:34 +01:00
Błażej Szczygieł 7143401e25 Theora: Don't compile unnecessary files, rename "x86_opt_*"
(cherry picked from commit 4ffa8f224d)
2016-10-30 14:51:34 +01:00
Rémi Verschelde f4414e3e03 png: Try to fix neon issue on iphone armv7
(cherry picked from commit e57042e8a9)
2016-10-30 14:51:34 +01:00
Rémi Verschelde aa1367595e drivers: Refactor SCsub and drop redundant env_drivers clone
The reordering of the SConscript includes allows to ensure that
stuff like the builtin zlib headers will be available for libpng.

Also moved glew back into global env, otherwise windows seems
not to find it... Kind of shooting in the dark with this multi-env
setup.

(cherry picked from commit 248bc9159c)
2016-10-30 14:51:34 +01:00
Rémi Verschelde d96842b80e freetype: Make it a module and split thirdparty library
Comment out the weird workaround for building on Windows at it might
not be needed anymore. Testing needed to confirm.

(cherry picked from commit edbc0c0d0b)
2016-10-30 14:51:33 +01:00