Commit Graph

5954 Commits

Author SHA1 Message Date
Rémi Verschelde 6b2db2f1b6 Merge pull request #7122 from zaps166/webm_msvc2013
Fix compilation with MSVC 2013
2016-11-21 11:53:32 +01:00
Rémi Verschelde 4965ddfaa1 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.
2016-11-19 14:09:01 +01:00
Rémi Verschelde c32766a482 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.
2016-11-19 13:39:03 +01:00
Rémi Verschelde ec4be71fad libpng: Same fix as previous commit for server platform 2016-11-19 13:25:17 +01:00
Rémi Verschelde 5fa1bb331a 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.
2016-11-19 12:59:48 +01:00
Ariel Manzur 159650fe6f memory ops implemented as OS functions by default
(cherry picked from commit 67f65f66391327b2967a20a89c3627e1dd6e84eb)
2016-11-18 21:55:30 +01:00
Ariel Manzur b3616089fa adding get_stored_values method
changed order name

(cherry picked from commit dbca4ee3fe283f59a8c9d50aae73b97f48be7b01)
2016-11-18 21:55:21 +01:00
Rémi Verschelde 959683c3d8 Add missing commit title in the log example 2016-11-16 13:08:28 +01:00
Rémi Verschelde 15cdb5219c Add instructions about git commit log formatting 2016-11-16 13:01:01 +01:00
Błażej Szczygieł 570a8e6b40 Fix compilation with MSVC 2013 2016-11-15 12:10:05 +01:00
Rémi Verschelde ea87f0f9d9 Blimey! Ye Pirate locale be anchor' a'port! 2016-11-15 09:01:51 +01:00
Rémi Verschelde 4c698f825d i18n: Sync template and translations with current code 2016-11-15 08:58:29 +01:00
Rémi Verschelde 3b42e0a336 i18n: Sync translations with Weblate
Adds initial translations for Hungarian and Pirate (yaaaar!)
2016-11-15 08:57:54 +01:00
Rémi Verschelde 635db806c4 Merge pull request #7115 from sketchyfun/path3D_handle_snap
Added snapping to 3D path handles
2016-11-15 08:17:55 +01:00
Rémi Verschelde 394d48a5fc Merge pull request #7113 from volzhs/check-project-path
Check entered and trimmed path when create, import, install project
2016-11-15 08:17:21 +01:00
Rémi Verschelde 77f5b683c4 Merge pull request #7112 from khairul169/hidehttpreqdebug
Disable debug properties of HTTP Request
2016-11-15 08:17:04 +01:00
George Marques e167c664c8 Merge pull request #7109 from volzhs/emit-signal-from-set
Emit "*_changed" signal in set_*
2016-11-14 13:46:28 -02:00
Ben Hickling 4d1acab79b Added snapping to 3D path handles to bring it in line with its 2D counterpart 2016-11-14 14:46:08 +00:00
volzhs 2d9e89ea2a Check entered and trimmed path when create, import, install project 2016-11-14 21:46:10 +09:00
Rémi Verschelde bbc71083c1 Merge pull request #7111 from volzhs/crash-import-scene
Fix crash when select target path on import 3d scene window
2016-11-14 08:28:20 +01:00
Rémi Verschelde d314c24d72 Merge pull request #7110 from RandomShaper/patch-2
Update/fix Android build
2016-11-14 08:27:44 +01:00
Rémi Verschelde 715ab48a54 Merge pull request #7107 from eska014/wasm
Some WebAssembly stuff
2016-11-14 08:26:24 +01:00
Rémi Verschelde add2cf65a6 Merge pull request #7101 from volzhs/fix-box-selection
Prevent to select children if selection lock or instanced scene
2016-11-14 08:25:10 +01:00
khairul169 6a7aebdf6c Uncomment debug properties of HTTP Request 2016-11-14 09:27:10 +07:00
volzhs b0cf201ea3 Fix crash when select target path on import 3d scene window 2016-11-14 08:36:01 +09:00
Pedro J. Estébanez 5a26459c06 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
2016-11-13 23:54:06 +01:00
volzhs 384625aa31 Emit "*_changed" signal in set_* 2016-11-14 04:21:29 +09:00
eska d87b1d1338 Remove explicit BINARYEN_METHOD for WebAssembly build
This option is the default since Binaryen version 21.
2016-11-13 15:38:12 +01:00
eska 82addf2ffe Enable memory growth in WebAssembly builds
This allows setting TOTAL_MEMORY during runtime at the cost of reserving
a bit more memory.
2016-11-13 15:29:03 +01:00
eska 31f929caa2 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.
2016-11-13 15:27:17 +01:00
volzhs c3f4d676c0 Prevent to select children if selection lock or instanced scene
Fix #7086
2016-11-12 22:43:31 +09:00
Ignacio Etcheverry c93c2a6be8 Merge pull request #6968 from neikeq/pr-register-trnglmesh
Core: Register TriangleMesh type
2016-11-12 14:01:59 +01:00
Rémi Verschelde 43e288973e Merge pull request #7100 from vnen/visualscript-positive
Add "Positive" operator to VisualScript
2016-11-12 12:35:43 +01:00
George Marques fa327f886e Add "Positive" operator to VisualScript 2016-11-11 23:46:32 -02:00
Rémi Verschelde 02e616b4ef Merge pull request #6998 from volzhs/fix-editor-settings
Fix resetting to default value in EditorSettings
2016-11-11 14:17:53 +01:00
Rémi Verschelde 7751a933a9 Merge pull request #6802 from henriquelalves/master
Added small modification on gdscript parser to allow users insert '+' before variables
2016-11-11 10:55:26 +01:00
Rémi Verschelde d0d81a2470 Merge pull request #7082 from volzhs/attach-script
Can create or load script on Attach script dialog
2016-11-11 10:55:16 +01:00
Rémi Verschelde 84822c3dbf Merge pull request #7079 from RandomShaper/quicker-android-export
Make Android export quicker (especially on Windows)
2016-11-11 10:52:10 +01:00
Rémi Verschelde 02fba9e396 Merge pull request #7078 from pkowal1982/export_button
Export immediately if only one device present
2016-11-11 10:52:00 +01:00
Rémi Verschelde f0f04d5082 Merge pull request #6862 from Faless/fix_6388
Fix Keyboard Input Hangs when using modifiers
2016-11-11 10:47:10 +01:00
Rémi Verschelde 34f0ce1168 Merge pull request #6833 from Elinvention/master
Make the step property useful for sliders
2016-11-11 10:46:17 +01:00
volzhs 1880238c3e Can create or load script on Attach script dialog 2016-11-11 05:06:39 +09:00
Rémi Verschelde 7d1230a266 Merge pull request #7052 from Paulb23/text_edit_color_uniformation
Made background and symbol color follow the color API
2016-11-09 15:47:15 +01:00
Rémi Verschelde 2ba1b58374 Merge pull request #7039 from RandomShaper/fix-triangulation
Clean/fix triangulation internals
2016-11-09 15:46:13 +01:00
Rémi Verschelde 22542bc767 Merge pull request #7030 from volzhs/fix-dir-access-android
Fix Directory.dir_exist/get_current_dir for 'res://' on Android
2016-11-09 12:54:59 +01:00
Rémi Verschelde a201fbb751 Merge pull request #7027 from Keetz/master
Fix scene tree drag & drop places node as child (#6912)
2016-11-09 12:53:35 +01:00
Rémi Verschelde 45f0903839 Merge pull request #7070 from ISylvox/vsnc-to-vsync
Renames vsnc to vsync
2016-11-09 12:03:04 +01:00
Rémi Verschelde 734e04a0dd Merge pull request #7068 from volzhs/fix-project-name
Set project name as directory name instead of '.'
2016-11-09 12:02:24 +01:00
Rémi Verschelde 9a504b650e Merge pull request #7063 from volzhs/pm-auto-select
Select newly created or imported project automatically
2016-11-09 11:49:28 +01:00
Rémi Verschelde aa61e9b242 Merge pull request #7060 from volzhs/label-valign
Fix Label valign position
2016-11-09 11:45:22 +01:00