24689 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcel Admiraal	6c3be2ca74	Fix Visual Studio throwing C4146 warning.	2019-11-18 15:14:04 +00:00
Rémi Verschelde	3c83137771	Merge pull request #33662 from touilleMan/issue-30577 ... Add singleton_name field to autogenerated json api	2019-11-16 23:00:07 +01:00
Rémi Verschelde	e9f905dccc	Merge pull request #33637 from madmiraal/fix-c4334-warning ... Fix Visual Studio throwing C4334 warning.	2019-11-16 22:55:09 +01:00
Rémi Verschelde	53bc47a4da	Merge pull request #33643 from Calinou/visual-script-multiply-sign ... Use the Unicode "multiply" sign for the "A x B" visual script node	2019-11-16 22:54:41 +01:00
Rémi Verschelde	c9782b0e97	Merge pull request #33645 from Calinou/graphedit-ctrl-toggle-snapping ... Make holding Ctrl toggle snapping in GraphEdit	2019-11-16 22:54:17 +01:00
Rémi Verschelde	f392c4ea7a	Merge pull request #33658 from NeoSpark314/rename_ext_msaa ... Rename External MSAA to AndroidVR MSAA	2019-11-16 22:52:51 +01:00
Rémi Verschelde	6cde380cee	Merge pull request #33603 from neikeq/ばか ... Mono/C#: WebAssembly and initial AOT support	2019-11-16 22:44:13 +01:00
Emmanuel Leblond	03e1568aeb	Add singleton_name field to autogenerated json api	2019-11-16 20:29:54 +01:00
Holger Dammertz	1b9c2ec92e	Rename External MSAA to AndroidVR MSAA ... A new external MSAA setting was introduced in https://github.com/godotengine/godot/pull/33518 that fixed issues on GLES2 and Oculus Mobile VR. To avoid misunderstanding it was suggested by @BastiaanOlij and discussed on discord to rename it to AndroidVR.	2019-11-16 15:36:43 +01:00
Hugo Locurcio	72b31aafc4	Make holding Ctrl toggle snapping in GraphEdit ... This affects the visual script and visual shader editors as well.	2019-11-15 19:34:44 +01:00
Hugo Locurcio	08b4671e03	Use the Unicode "multiply" sign for the "A x B" visual script node	2019-11-15 19:06:53 +01:00
Marcel Admiraal	8fa72a20f3	Fix Visual Studio throwing C4334 warning.	2019-11-15 14:11:12 +01:00
Rémi Verschelde	98caeb635c	Merge pull request #33632 from lupoDharkael/ternary-check ... Parser: Check all the arguments of the ternary operator	2019-11-15 13:31:32 +01:00
Rémi Verschelde	fea3890e1e	Merge pull request #33635 from akien-mga/emscripten-fix-1.39.1-support ... HTML5: Fix support for Emscripten 1.39.1+	2019-11-15 10:20:47 +01:00
Rémi Verschelde	e9e2a4b044	HTML5: Fix support for Emscripten 1.39.1+ ... A change in upstream Emscripten 1.39.1+ made our buildsystem error out where it was previously only issuing a warning: ``` [ 5%] Linking Static Library ==> main/libmain.javascript.opt.bc shared:WARNING: Assuming object file output in the absence of `-c`, based on output filename. Please add with `-c` or `-r` to avoid this warning Ranlib Library ==> main/libmain.javascript.opt.bc /opt/emsdk/upstream/bin/llvm-ranlib: error: unable to load 'main/libmain.javascript.opt.bc': file too small to be an archive ``` As advised on emscripten-core/emscripten#9806, we should be using `emar` here to create the static library and not `emcc`. This was apparently done to workaround Emscripten issues in the past, but evidently this is no longer necessary. The rest of the `env` redefinitions should probably be re-assessed against the current state of Emscripten. Fixes #33374.	2019-11-15 09:39:19 +01:00
Ignacio Etcheverry	8cbe4a3db4	Make C# internal calls return structs as ref parameters ... The Mono IL interpreter's WebAssembly to native trampolines don't support passing structs by value, so we need to do it this way. Also now we pass and return long, ulong, float and double as ref parameters as well. This is due to missing trampolines for float and long types. This is likely a temporary workaround that will be reverted in the future. The correct solution would be to patch 'mono/mini/m2n-gen.cs' when building the Mono runtime for WASM in order to generate the trampolines we need.	2019-11-15 03:22:25 +01:00
Ignacio Etcheverry	2b67924a0b	Mono/C#: Initial exporter support for AOT compilation	2019-11-15 03:22:18 +01:00
lupoDharkael	9254961297	Parser: Check all the arguments of the ternary operator	2019-11-15 01:29:18 +01:00
Rémi Verschelde	d1f8fd6384	Merge pull request #33607 from Calinou/orbit-modifier-always-alt ... Always allow Alt as an orbit modifier in the 3D editor	2019-11-14 20:14:36 +01:00
Hugo Locurcio	1e28571d82	Always allow Alt as an orbit modifier in the 3D editor ... This makes it easier to navigate in 3D when using a graphics tablet. This fallback modifier will only be available if no other modifier is using Alt. This partially addresses https://github.com/godotengine/godot-proposals/issues/196.	2019-11-14 17:40:15 +01:00
Rémi Verschelde	a9fe8a7c3a	Merge pull request #33621 from Calinou/export-runnable-tooltip ... Add a tooltip to explain what marking a preset as "runnable" does	2019-11-14 15:38:32 +01:00
Hugo Locurcio	bc8236bd39	Add a tooltip to explain what marking a preset as "runnable" does	2019-11-14 15:11:31 +01:00
Rémi Verschelde	f244772028	Merge pull request #33617 from Chaosus/fix_theme_element2 ... Fix incorrect error/matches label color when switching from light to dark theme	2019-11-14 12:38:04 +01:00
Rémi Verschelde	41634199c8	EditorNode: Improve tooltip for pause button ... Closes #14742.	2019-11-14 11:44:20 +01:00
Yuri Roubinsky	0ec76d40b4	Fix incorrect error label color when switching from light to dark theme	2019-11-14 13:34:56 +03:00
Rémi Verschelde	a1c396e55c	Merge pull request #33614 from Chaosus/fix_theme_element ... Fix "matches" label color in light theme	2019-11-14 10:54:59 +01:00
Rémi Verschelde	9d12b0f958	Merge pull request #33608 from groud/disable_ok_button_input_settings ... Disable ok button if no key is selected when adding event to an action	2019-11-14 10:53:40 +01:00
Rémi Verschelde	9ad1a167fb	Merge pull request #33601 from willnationsdev/nodepath-docs ... Added more in-depth examples of NodePaths in API docs.	2019-11-14 10:03:49 +01:00
Yuri Roubinsky	facfae3671	Fix "matches" label color in light theme	2019-11-14 09:44:53 +03:00
Gilles Roudière	0287baf078	Disable ok button if no key is selected when adding event to an action	2019-11-13 22:37:06 +01:00
willnationsdev	db0082534c	Added more in-depth examples of NodePaths in API docs.	2019-11-13 15:14:50 -06:00
Ignacio Etcheverry	de7c2ad21b	Mono/C#: WebAssembly support	2019-11-13 21:41:11 +01:00
Rémi Verschelde	14e52f7aee	Merge pull request #33595 from Faless/fix/explain_msg_strip ... Fix explain message not being stripped in release.	2019-11-13 19:11:01 +01:00
Rémi Verschelde	0132555dfa	Merge pull request #33596 from KoBeWi/sell_tile ... Make sure tile is selected when selecting TileMap	2019-11-13 15:26:56 +01:00
Tomasz Chabora	f7476359e0	Make sure tile is selected when selecting TileMap	2019-11-13 14:26:37 +01:00
Fabio Alessandrelli	0d7409adfb	Fix explain message not being stripped in release. ... Messages coming from ERR_EXPLAIN / ERR_*_MSG macros used to strip the error explanation in release builds and was changed in a recent refactoring. This commit restores the old behaviour (fixing release builds).	2019-11-13 14:21:32 +01:00
Rémi Verschelde	d3a852f124	Merge pull request #33591 from zaksnet/fix-string-docs-split ... Fix split/rsplit docs	2019-11-13 14:03:14 +01:00
Zak	79aca6b0c0	Fix split/rsplit docs	2019-11-13 14:58:19 +02:00
Rémi Verschelde	a439c55eff	Merge pull request #33589 from JFonS/fix_scaled_gizmos ... Fix broken gizmo interaction when Node is scaled	2019-11-13 13:43:57 +01:00
JFonS	1f623c5a2b	Fix broken gizmo interaction when Node is scaled	2019-11-13 12:22:08 +01:00
Rémi Verschelde	8d7de9a9e9	Merge pull request #33536 from akien-mga/revert-25474-android-gestures ... Revert "Android : implement InputEventMagnifyGesture and InputEventPanGesture"	2019-11-13 11:14:09 +01:00
Rémi Verschelde	35444576ff	Merge pull request #33576 from merumelu/doc-reload-current-scene ... Doc: Add return values for SceneTree::reload_current_scene	2019-11-12 23:17:51 +01:00
Rémi Verschelde	da4079f231	Merge pull request #33575 from KoBeWi/zoomset ... Properly handle zoom when opening tileset editor	2019-11-12 23:17:01 +01:00
IlyaStuurFedorov	fa45fdb5f5	doc: PCKPacker class example code	2019-11-12 23:15:29 +01:00
Rémi Verschelde	30d4c923cb	Merge pull request #32966 from ffaristocrat/fix-hex-parsing ... Fix base 16 hex literal parsing	2019-11-12 23:04:20 +01:00
Micheál Keane	4b9fd961d6	Fixes #32963 by correctly parsing bin/hex literals	2019-11-12 15:57:38 -05:00
merumelu	3de002db30	Doc: Add return values for SceneTree::reload_current_scene	2019-11-12 16:43:31 +01:00
Tomasz Chabora	1369e00973	Properly handle zoom when opening tileset editor	2019-11-12 16:23:53 +01:00
Rémi Verschelde	62a09a2ee3	Update AUTHORS list ... New contributors added to AUTHORS: @kawa-yoiko, @m4gr3d, @QbieShay, @RevoluPowered, @rxlecky	2019-11-12 15:44:25 +01:00
Ignacio Roldán Etcheverry	953f37f49b	Merge pull request #33249 from JoshLee0915/MonoHeadlessServer ... Added missing server platform checks to template dir and shared lib copy in mono_configure.py	2019-11-12 14:57:29 +01:00