maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
24980 commits 10 branches 35 tags 1.1 GiB
Commit graph

24980 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Rémi Verschelde
5bdb4827da
Merge pull request #33571 from KoBeWi/new_crash 
Prevent crash when scene has path, but no file
 2019-11-12 14:25:44 +01:00
Tomasz Chabora
57b12c10ab Prevent crash when scene has path, but no file 2019-11-12 14:09:58 +01:00
Rémi Verschelde
750e61c140
Merge pull request #33568 from akien-mga/opus-fixup-33311 
opus: Packaging fixups after #33311
 2019-11-12 13:36:36 +01:00
Rémi Verschelde
0387657fa4 opus: Packaging fixups after #33311 
Removes the custom code for VS2012 support in config.h,
and reduces diff with upstream config.h.

We still have many custom defines for ARM optimizations
which we probably don't use properly, since we don't
compile the included asm code, so a thorough review and
cleanup would be welcome.
 2019-11-12 12:58:32 +01:00
Rémi Verschelde
7d836a7cc3
Merge pull request #33565 from akien-mga/vhacd-b07958e 
vhacd: Sync with upstream b07958e
 2019-11-12 09:57:10 +01:00
Rémi Verschelde
466e867d77
Merge pull request #33563 from akien-mga/tinyexr-656bb61 
tinyexr: Sync with upstream 656bb61
 2019-11-12 09:53:40 +01:00
Rémi Verschelde
cbc5d9405f
Merge pull request #33562 from akien-mga/nanosvg-25241c5 
nanosvg: Sync with upstream c1f6e20
 2019-11-12 09:52:47 +01:00
Rémi Verschelde
604891a87d
Merge pull request #33561 from akien-mga/miniupnpc-0ab1d67 
miniupnpc: Sync with upstream master (0ab1d67)
 2019-11-12 09:49:45 +01:00
Rémi Verschelde
f6e62f1147
Merge pull request #33560 from akien-mga/mbedtls-2.16.3 
mbedtls: Update to upstream version 2.16.3
 2019-11-12 09:49:38 +01:00
Rémi Verschelde
94bf2f648e
Merge pull request #33559 from akien-mga/glad-0.1.33 
glad: Sync with upstream 0.1.33
 2019-11-12 09:49:27 +01:00
Rémi Verschelde
424d2fcfb4 vhacd: Sync with upstream b07958e 
Nothing to see here, it is just a cosmetic sync to confirm
that we have the latest upstream changes.
 2019-11-12 09:24:09 +01:00
Rémi Verschelde
6a2c2e5062 tinyexr: Sync with upstream 656bb61 2019-11-12 09:17:05 +01:00
Rémi Verschelde
097b746fdd nanosvg: Sync with upstream c1f6e20 
Now formally unmaintained, so probably no further sync to expect
from this repository.
 2019-11-12 09:12:11 +01:00
Rémi Verschelde
e2fbfb1ded miniupnpc: Sync with upstream master (0ab1d67) 2019-11-12 09:06:31 +01:00