Commit graph

5934 commits

Author SHA1 Message Date
Błażej Szczygieł
570a8e6b40 Fix compilation with MSVC 2013 2016-11-15 12:10:05 +01: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
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
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
Rémi Verschelde
699ac17c53 Merge pull request #7058 from SPTelur/Add-Missing-License
Add License Notice for Two Files (A_Star)
2016-11-09 11:40:27 +01:00
Pedro J. Estébanez
56721e5d9d Make Android export quicker (especially on Windows) 2016-11-08 20:56:17 +01:00
Pawel Kowal
938f9388dd Export immediately if only one device present 2016-11-08 20:08:07 +01:00
volzhs
8d454ed9a7 Fix Directory.dir_exist/get_current_dir for 'res://' on Android
Fix #7014
2016-11-09 01:50:00 +09:00
ISylvox
b5c383fd61 vsnc --> vsync 2016-11-08 21:06:57 +07:00
volzhs
571f33f863 Set project name as directory name instead of '.' 2016-11-08 21:39:28 +09:00
volzhs
b8f80e9450 Select newly created or imported project automatically 2016-11-08 03:39:05 +09:00
volzhs
c0e87f2a24 Fix Label valign position
Fix #7055
2016-11-07 20:15:21 +09:00
SPTelur
df737ebb46 Some missing License notice has been added 2016-11-07 06:16:18 +06:00
George Marques
cdc4664226 Merge pull request #7053 from Paulb23/caret_blink_redraw_issue_6167
Caret blink will no longer cause redraw without focus, issue 6167
2016-11-06 14:16:19 -02:00
George Marques
88b00cb658 Merge pull request #7048 from neikeq/pr-marshals-singleton
Add singleton instance to _Marshalls
2016-11-06 13:34:18 -02:00
Paulb23
7b036a94bf Caret blink will no longer cause redraw without focus, issue 6167 2016-11-06 14:15:59 +00:00
Paulb23
0e2c15e91a Made background and symbol color follow the color API 2016-11-06 13:50:23 +00:00
Rémi Verschelde
a4570cb461 Merge pull request #7035 from volzhs/undo-redo-duplicate
Prevent to make UndoRedo for duplicate if no selected node
2016-11-06 12:09:49 +01:00
Rémi Verschelde
9f7b781657 Merge pull request #7050 from DTV96Calibre/master
Fixed minor typo
2016-11-06 12:09:40 +01:00
Rémi Verschelde
c099b32b6c Merge pull request #7036 from volzhs/spinbox-prefix
Fix updating value of SpinBox with prefix
2016-11-06 12:07:54 +01:00
Rémi Verschelde
57cc953cff Merge pull request #7028 from bojidar-bg/gdscript-multiline-comment-fixup
Make GDScript parser ignore floating strings in class definition
2016-11-06 12:07:02 +01:00
Rémi Verschelde
415f5a7cfe Merge pull request #7026 from SaracenOne/value_track_flag_fix
Fixed flag for importing animation and skipping value tracks.
2016-11-06 12:04:04 +01:00
Rémi Verschelde
a3724b596d Merge pull request #7020 from akien-mga/pr-readme
Rewrite the README to be more descriptive
2016-11-06 12:03:28 +01:00
Rémi Verschelde
be4eff1d8b Merge pull request #7019 from vnen/rename-winrt-uwp
Rename WinRT platform to UWP
2016-11-06 12:03:10 +01:00