Commit graph

12486 commits

Author SHA1 Message Date
Rémi Verschelde 05b1843818
Merge pull request #15696 from bojidar-bg/15646-assigned-animation
Fix an issue with the animation editor not seeking to the target time
2018-01-15 08:54:07 +01:00
Rémi Verschelde cd62fd48f9
Merge pull request #15728 from Zylann/fix_freelook_null_shortcut
Fix crash when freelook shortcuts are undefined
2018-01-15 07:40:25 +01:00
Rémi Verschelde b68a972971
Merge pull request #15712 from Faless/viewport_input
ViewportContainer passes input down to children viewports
2018-01-15 07:39:17 +01:00
Fabio Alessandrelli 765051e104 ViewportContainer passes input down to children viewports 2018-01-15 00:36:57 +01:00
Marc Gilleron 6a4e89b6ec Fix crash when freelook shortcuts are undefined 2018-01-15 00:32:27 +01:00
Rémi Verschelde 0a691bf29e
Merge pull request #15671 from Calinou/non-tty-simple-build-log
Disable colored output and progress bar when building outside of a TTY
2018-01-14 22:48:47 +01:00
George Marques 109242c011
Merge pull request #15709 from Paulb23/update_member_keyword_colour_on_change
Fixed member keywords colour not updating on settings change
2018-01-14 14:44:57 -02:00
Paulb23 896a0c5ef5 Fixed member keywords colour not updating on settings change 2018-01-14 16:31:46 +00:00
Rémi Verschelde a1a67e6e84
Merge pull request #15708 from Paulb23/current_line_clipping_issue_15427
Fixed current line highlighting with horizontal clipping, issue 15427
2018-01-14 17:22:09 +01:00
Paulb23 386c57cfad Fixed current line highligting with horizontal clipping, issue 15427 2018-01-14 16:06:27 +00:00
Rémi Verschelde 515da5b08b
Merge pull request #15706 from groud/remove_unused_class
Remove the unused FindReplaceDialog class
2018-01-14 16:57:27 +01:00
Gilles Roudiere c318cdad66 Remove the unused FindReplaceDialog class 2018-01-14 16:23:01 +01:00
Rémi Verschelde f96f11c850
Merge pull request #15699 from poke1024/fix15024
Fix external editors always opening on scene change
2018-01-14 15:15:59 +01:00
Bernhard Liebl 89057dd289 Fix external editors always opening on scene change 2018-01-14 12:34:00 +01:00
Bojidar Marinov f2355949c4
Fix an issue with the animation editor not seeking to the target time properly.
Fixes #15646.
2018-01-14 12:28:57 +02:00
Thomas Herzog 859ac6233d
Merge pull request #15684 from karroffel/nativescript-windows-editor-crash
[GDNative] fix editor crash with NativeScript
2018-01-14 01:40:48 +01:00
karroffel 567d20fe5f [GDNative] fix editor crash with NativeScript 2018-01-14 01:01:35 +01:00
Rémi Verschelde 6a4521da2a
Merge pull request #15679 from bruvzg/fix_itos_on_int64_min
Fix String::itos/String::num_int64(INT64_MIN) output.
2018-01-13 21:25:43 +01:00
Rémi Verschelde e15ee649b8
Merge pull request #15680 from karroffel/gdnative-api-hash-cache
[GDNative] cache API hashes
2018-01-13 21:25:26 +01:00
karroffel ee8ee463c3 [GDNative] cache API hashes 2018-01-13 21:21:05 +01:00
bruvzg d0868a8f40
Fix String::itos/String::num_int64(INT64_MIN) output. 2018-01-13 22:06:08 +02:00
Rémi Verschelde 5988ae6cda
Merge pull request #15676 from eska014/html5-enginewrap
Wrap Emscripten module into JS Engine singleton per SCons
2018-01-13 20:16:36 +01:00
Leon Krause bd1750c076 Wrap Emscripten module into JS Engine singleton per SCons
Emscripten's meta DCE changes in 1.37.27(/28?) make it impossible to
keep using --pre-js for this
2018-01-13 19:40:59 +01:00
Hugo Locurcio bf32d36230
Disable colored output and progress bar when building outside of a TTY
This makes the output more readable if it is written to a file,
and more compact in continuous integration environments, keeping
the log sizes low.

This commit also adds myself to .mailmap.
2018-01-13 17:56:41 +01:00
Rémi Verschelde 892568abee
Merge pull request #15670 from poke1024/fix15588
Fixes hangs with Tree in multi selection mode (issue 15588)
2018-01-13 17:45:03 +01:00
Bernhard Liebl 363980519c Fixes hangs with Tree in multi selection mode (issue 15588) 2018-01-13 17:34:12 +01:00
Rémi Verschelde 69452fbc37
Merge pull request #15657 from paulloz/fix-textedit-undo-redo-selection
TextEdit: Fix selection issue with undo/redo
2018-01-13 17:05:46 +01:00
Rémi Verschelde 63e980f746
Merge pull request #15655 from endragor/fix-get-parent-range
Fix get_parent_range to return 0 when there is no parent
2018-01-13 17:05:36 +01:00
Rémi Verschelde 5f22422d99
Merge pull request #15665 from endragor/fix-android-gdnative
Fix open_dynamic_library for Android
2018-01-13 17:04:42 +01:00
Rémi Verschelde d4fc8c8ea1
Merge pull request #15669 from poke1024/fix-dep-files-size
Fix files section size in dependency error dialog
2018-01-13 17:04:14 +01:00
Bernhard Liebl 42d59f4c5d Fix files section size in dependency error dialog 2018-01-13 17:00:00 +01:00
Rémi Verschelde e141845bfb SCons: Allow unbundling bullet on Linux (only 2.87+) 2018-01-13 15:16:22 +01:00
Rémi Verschelde af9c2f8b9c COPYRIGHT: Update with recently added thirdparty libraries
Also various updates to thirdparty/README.md.
2018-01-13 14:44:53 +01:00
Rémi Verschelde a3ee252993
Merge pull request #15664 from akien-mga/thirdparty
Bugfix updates to various thirdparty libraries
2018-01-13 14:43:30 +01:00
Ruslan Mustakov 1d763a2cb8 Fix open_dynamic_library for Android 2018-01-13 20:40:20 +07:00
Rémi Verschelde e12c89e8c9 bullet: Streamline bundling, remove extraneous src/ folder
Document version and how to extract sources in thirdparty/README.md.
Drop unnecessary CMake and Premake files.
Simplify SCsub, drop unused one.
2018-01-13 14:08:45 +01:00
Rémi Verschelde 53c65ae761 zstd: Update to pristine 1.3.3 2018-01-13 13:50:59 +01:00
Rémi Verschelde 76e5b048d0 tinyexr: Update to pristine commit e385dad (security update) 2018-01-13 13:46:03 +01:00
Rémi Verschelde 00abb1f201 openssl: Update to pristine 1.0.2n (security update) 2018-01-13 13:39:08 +01:00
Rémi Verschelde de0b31edd5 libogg: Update to pristine version 1.3.3 2018-01-13 13:00:44 +01:00
Paul Joannon 8ae0624c80 Deselect on undo/redo in TextEdit 2018-01-13 11:46:53 +01:00
Rémi Verschelde c01575b312 doc: Sync with current source 2018-01-13 11:43:49 +01:00
Rémi Verschelde e28cdc4654 doc: Update version string in XML 2018-01-13 11:43:42 +01:00
Ruslan Mustakov 0b632be4a9 Fix get_parent_range to return 0 when there is no parent
Fixes #15635
2018-01-13 16:48:07 +07:00
Rémi Verschelde 7de3a11469
Merge pull request #15653 from letheed/has-shader-override
Small fix for Control bindings
2018-01-13 10:31:54 +01:00
Rémi Verschelde 5d6beba4cc
Merge pull request #15654 from binbitten/fix-subres-click
Fix clicking on sub-resources in a node's right-click menu
2018-01-13 10:29:22 +01:00
letheed 524ee14054 Small fix for Control bindings 2018-01-13 09:40:42 +01:00
binbitten 1e9fbcf36c Fix clicking on sub-resources in a node's right-click menu 2018-01-13 09:05:50 +01:00
Rémi Verschelde 30d7943311 Bump version to 3.0-rc1
Nothing to see here.. ;)
2018-01-13 01:45:15 +01:00
Rémi Verschelde e1a0f2bd71
Merge pull request #15636 from mrcdk/fix_canvas_light
Set correct types on a couple variables inside light_compute in canvas.glsl
2018-01-13 01:42:52 +01:00