Commit Graph

5458 Commits

Author SHA1 Message Date
Rémi Verschelde 24a440a34f Merge pull request #7239 from eska014/2.1-asmjs
Backport web export changes for 2.1
2016-12-08 07:46:37 +01:00
eska 5ede1a1226 Emit asm.js code into a dedicated file for asm.js export
This helps prevent browser lockups during start-up at the cost of having
to distribute an extra file.
2016-12-04 02:52:14 +01:00
eska 17422f1f86 Add fullscreen features in web export
- Implement fullscreen control, get_window_size, get_screen_size
 - Fix fullscreen resolution
2016-12-04 02:52:14 +01:00
eska 49e22aa83f Fix some mouse bugs in WebAssembly/asm.js
- Emit mouse wheel release events
 - Set button masks, fixes #5092
2016-12-03 15:33:59 +01:00
eska 6d86a63648 OS additions and fixes for WebAssembly/asm.js
- Implement alert, shell_open, set_window_title
 - Add locale lookup, fixes #2477
 - Print without color control sequences
 - Move get_executable_path implementation to OS_JavaScript
2016-12-03 15:33:32 +01:00
Rémi Verschelde a3582fa3cb png: Allow building shared freetype with bundled libpng
This was the behaviour when building Godot 2.1, which allows to build against
Ubuntu 12.04 and its freetype that links old libpng12, while still bundling
libpng16.

(cherry picked from commit 4965ddfaa1)
2016-11-19 14:09:12 +01:00
Rémi Verschelde 326978dcce Revert "libpng: Fix erroneously linking against libpng12 on old distros"
This reverts commits 5fa1bb331a
and ec4be71fad.

Looks like Debian/Ubuntu are not even shipping libpng16 nowadays in their
stable releases, we'll have to go back to statically linking our own
libpng16 to wait for them to stop being 5 years behind everybody.

(cherry picked from commit c32766a482)
2016-11-19 13:40:53 +01:00
Rémi Verschelde 76233a3022 libpng: Same fix as previous commit for server platform
(cherry picked from commit ec4be71fad)
2016-11-19 13:26:30 +01:00
Andreas Haas ed2c369785 Fix Script Editor drawing over Dialogs.
Resets the z-index when focus is lost and the completion is shown.

Fixes #6769

(cherry picked from commit f73b501d6f)
2016-11-19 13:04:02 +01:00
Rémi Verschelde 220bcbf7c0 libpng: Fix erroneously linking against libpng12 on old distros
This bit us for 2.1.1 binaries built on Ubuntu 12.04 LTS where
libpng.pc apparently prioritizes libpng12.

(cherry picked from commit 5fa1bb331a)
2016-11-19 13:00:17 +01:00
Rémi Verschelde 3e2247ca53 Release 2.1.1-stable 2016-11-15 09:14:21 +01:00
Rémi Verschelde bf3cf5505e classref: Sync with current source 2016-11-15 09:14:02 +01:00
Rémi Verschelde bcc887bbe5 i18n: Sync translations with Weblate and update template 2016-11-15 09:10:37 +01:00
Rémi Verschelde 9b32df9cab i18n: Remove translations below 20% completion
They are of course kept in master to be synced in Weblate.
2016-11-15 09:07:53 +01:00
Ben Hickling 601f056b6f Added snapping to 3D path handles to bring it in line with its 2D counterpart
(cherry picked from commit 4d1acab79b)
2016-11-15 08:44:53 +01:00
volzhs 14b46c4263 Check entered and trimmed path when create, import, install project
(cherry picked from commit 2d9e89ea2a)
2016-11-15 08:44:53 +01:00
khairul169 8a813e2a1e Uncomment debug properties of HTTP Request
(cherry picked from commit 6a7aebdf6c)
2016-11-15 08:44:53 +01:00
volzhs 679e9f413c Fix crash when select target path on import 3d scene window
(cherry picked from commit b0cf201ea3)
2016-11-15 08:44:53 +01:00
Pedro J. Estébanez 19ce11b908 Update/fix Android build
Fix wrong path for 32-bit Windows, which fixes #7084
Exclude 32-bit Windows from multi-threaded linking because it's not supported by the NDK
Remove 32-bit Linux as there is no NDK variant for it
(cherry picked from commit 5a26459c06)
2016-11-15 08:44:53 +01:00
eska 28944e95e7 Clarify a NULL comparison
'TreeItem::get_children()' does not return the child count, but rather
a pointer to the children.

This comparison caused an error during WebAssembly builds using the
LLVM backend path.

(cherry picked from commit 31f929caa2)
2016-11-15 08:37:53 +01:00
volzhs 2d6dabc68e Prevent to select children if selection lock or instanced scene
Fix #7086

(cherry picked from commit c3f4d676c0)
2016-11-15 08:37:48 +01:00
volzhs 9219ac7e44 Fix resetting to default value in EditorSettings
(cherry picked from commit 70cce6152d)
2016-11-15 08:36:53 +01:00
Elia Argentieri e3dc319f78 Make the step property useful for sliders as described in #5773
(cherry picked from commit 0955371447)
2016-11-15 08:36:18 +01:00
Pedro J. Estébanez 221346521c Make Android export quicker (especially on Windows)
(cherry picked from commit 56721e5d9d)
2016-11-15 08:35:15 +01:00
Pawel Kowal f1c2d70f1a Export immediately if only one device present
(cherry picked from commit 938f9388dd)
2016-11-15 08:35:01 +01:00
volzhs 3e127ce3fd Fix Directory.dir_exist/get_current_dir for 'res://' on Android
Fix #7014

(cherry picked from commit 8d454ed9a7)
2016-11-15 08:34:51 +01:00
ISylvox 0413d85add vsnc --> vsync
(cherry picked from commit b5c383fd61)
2016-11-15 08:34:43 +01:00
volzhs 7d09222b37 Set project name as directory name instead of '.'
(cherry picked from commit 571f33f863)
2016-11-15 08:34:38 +01:00
volzhs dd8b87f58e Select newly created or imported project automatically
(cherry picked from commit b8f80e9450)
2016-11-15 08:34:32 +01:00
volzhs 36a4c54593 Fix Label valign position
Fix #7055

(cherry picked from commit c0e87f2a24)
2016-11-15 08:34:26 +01:00
SPTelur 51fe9fc132 Some missing License notice has been added
(cherry picked from commit df737ebb46)
2016-11-15 08:34:16 +01:00
Paulb23 9e1e5daddf Caret blink will no longer cause redraw without focus, issue 6167
(cherry picked from commit 7b036a94bf)
2016-11-15 08:34:01 +01:00
DTV96Calibre bc8dabf3d2 Fixed minor typo
(cherry picked from commit 37098419c5)
2016-11-15 08:30:35 +01:00
Pedro J. Estébanez fada9d7a8e Clean/fix triangulation internals
Drop unused variable
Remove commented-out code
Fix leak by using Vector instead of raw memory

(cherry picked from commit 0e1972aa51)
2016-11-15 08:30:09 +01:00
volzhs 82b458f160 Fix updating value of SpinBox with prefix
(cherry picked from commit 80b6507071)
2016-11-15 08:30:02 +01:00
volzhs 64f38490df Prevent to make UndoRedo for duplicate if no selected node
(cherry picked from commit d82928eb49)
2016-11-15 08:29:56 +01:00
ScotFlux c282ac8ec7 fix a tiny typo
(cherry picked from commit 8639d6e806)
2016-11-15 08:29:30 +01:00
Rémi Verschelde 210618c5e2 Rewrite the README to be more descriptive
(cherry picked from commit ab9fa604d1)
2016-11-15 08:29:23 +01:00
volzhs 2b00fdc679 Fix wrong number for ERR_* on comment
(cherry picked from commit 42f2380190)
2016-11-15 08:29:09 +01:00
Tim Roes d7ec768805 Fix typos and missing newlines in --help
(cherry picked from commit c34aa331ec)
2016-11-15 08:28:58 +01:00
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