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

20341 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde 36a54ffebb
Merge pull request #27577 from guilhermefelipecgs/continuation_of_27562 
Continuation of #27562
 2019-04-21 13:16:35 +02:00
Rémi Verschelde 78eb25a4a8
Merge pull request #27860 from Calinou/improve-3d-snapping 
Make 3D snapping finer when holding Shift
 2019-04-21 13:12:10 +02:00
Rémi Verschelde 7d0275785b
Merge pull request #27940 from LeonardMeagher2/fix_csgshape_geometryinstance 
CSGMesh gets material + CSGShape inherits from GeometryInstance
 2019-04-21 13:07:29 +02:00
Rémi Verschelde 71bbe6eb01
Merge pull request #27979 from Paulb23/remember_script_state 
Restore script editor state between sessions
 2019-04-21 13:01:43 +02:00
Rémi Verschelde 7879968136
Merge pull request #28026 from Dentoid/insert_keyframe_fix 
Fix for "Insert Keyframe" shortcut doing nothing
 2019-04-21 12:58:24 +02:00
Rémi Verschelde e003324a1e
Merge pull request #28245 from guilhermefelipecgs/open_menu 
Small ux improvement
 2019-04-21 12:50:45 +02:00
Rémi Verschelde 03dfac8609
Merge pull request #28093 from fire/expose_localize_rest 
Expose localize_rests to gdscript.
 2019-04-21 09:31:18 +02:00
Rémi Verschelde db3dd67d47
Merge pull request #28130 from JFonS/add_3d_grouping 
Add grouping to 3D editor
 2019-04-21 09:30:15 +02:00
Hein-Pieter van Braam bc7178422e
Merge pull request #28217 from hpvb/fix-28089 
Don't crash on printing nested types
 2019-04-21 00:46:07 +03:00
Guilherme Felipe d835738045 Small ux improvement 2019-04-20 17:43:23 -03:00
Rémi Verschelde 5899972049
Merge pull request #27554 from volzhs/freetype-2.10.0 
Update freetype to 2.10.0
 2019-04-20 20:00:56 +02:00
Rémi Verschelde ec9cfa53a6
Merge pull request #28239 from jbuck3/editor-tooltip-fix 
Fix editor tooltip formatting
 2019-04-20 19:50:31 +02:00
James Buck 8b1b2f6a4c Fix editor tooltip formatting 
Removed unnecessary word wrap which caused broken tags and general
ugliness. Fixes #24926
 2019-04-20 11:51:50 -05:00
Fabio Alessandrelli 175942dcd1
Merge pull request #24951 from Mr-Slurpy/local-rpc-sender-id-fix 
Sender network id is now set to local network id for local rpc calls.
 2019-04-20 13:39:05 +02:00
Rémi Verschelde 725e8b771b
Merge pull request #28229 from akien-mga/disable_3d-build-fix 
Fix disable_3d=yes -Wunused-variable errors
 2019-04-20 11:53:24 +02:00
Rémi Verschelde f25b057846 Fix disable_3d=yes -Wunused-variable errors 2019-04-20 11:07:58 +02:00
Rémi Verschelde b3d2584960
Merge pull request #28210 from hpvb/fix-28134 
Object::script may not be a valid Ref<Script>
 2019-04-20 10:25:39 +02:00
Rémi Verschelde c1444ebeaf Fix typo in SpriteFrameEditor preview draw 
As spotted by @DennisWG.
 2019-04-20 09:08:07 +02:00
Ignacio Roldán Etcheverry 7be498499b
Merge pull request #27820 from ForLoveOfCats/master 
Mono: Convert all items to string before printing
 2019-04-20 04:12:22 +02:00
Hein-Pieter van Braam-Stewart 20b0046945 Object::script may not be a valid Ref<Script> 
It appears that Object::script may be a valid ScriptInstance but not be
castable to Ref<Script>. There were only 5 places in the code that made
this assumption. This commit fixes that.
 2019-04-20 02:13:28 +02:00
Hein-Pieter van Braam-Stewart 8b1e297fc6 Don't crash on printing nested types 
When adding an Array or Dictionary to itself operator String() got in an
infinite loop. This commit adds a stack to operator String() (Through
the use of a new 'stringify method'). This stack keeps track of all
unique Arrays and Dictionaries it has seen. When a duplicate is found
only a static string is printed '[...]' or '{...}'.

This mirror Python's behavior in a similar case.
 2019-04-20 02:01:55 +02:00
Rémi Verschelde 1120b0b2d3
Merge pull request #28200 from bojidar-bg/28115-ysort-breaks-shader 
Fix nested YSort breaking "Use parent material"
 2019-04-19 21:15:19 +02:00
Juan Linietsky 04847ef5f9 Added ability for multiple images to be imported as an atlas 
This adds support for groups in the import system, which point to a single file.
Add property hint for saving files in file field
 2019-04-19 15:56:34 -03:00
ForLoveOfCats 25f563c4c8 Mono: Convert all items to string before printing 2019-04-19 12:59:22 -04:00
Bojidar Marinov dd9bb6f186
Fix nested YSort breaking use_parent_material 
Fixes #28115
 2019-04-19 16:18:01 +03:00
Hasan Yusuf Ahmed 8e652a1400 Added minimal documentation for _get_configuration_warning method 
(cherry picked from commit 0eeb1a7d0d)
 2019-04-19 13:01:17 +02:00
Rémi Verschelde 8269ed9cdf
Merge pull request #28196 from akien-mga/xatlas-cleanup 
xatlas: Document provenance, copyright and custom changes
 2019-04-19 12:59:41 +02:00
Rémi Verschelde 7b1d75223a
Merge pull request #28193 from akien-mga/drop-thekla 
Drop unused thekla_atlas dependency
 2019-04-19 12:51:13 +02:00
Rémi Verschelde b29df348e2
Merge pull request #28192 from akien-mga/doc-unused-demos 
doc: Drop unused <demos> tag, sync classref
 2019-04-19 12:50:42 +02:00
Rémi Verschelde 44f9a966e0 xatlas: Redo our custom changes, but properly documented 2019-04-19 12:40:01 +02:00
Rémi Verschelde 1e39fee140 xatlas: Revert to unmodified upstream code, add to COPYRIGHT 
Imported by @reduz from b8ec29b6b6
Custom changes will be remade properly in the next commit.
 2019-04-19 12:39:26 +02:00
Rémi Verschelde 6640f397f1 Drop unused thekla_atlas dependency 
Since f12cb82 @reduz dropped the use of the thirdparty thekla_atlas
library, which is replaced by xatlas.

Fixes #28180.
Fixes #28182.
 2019-04-19 11:42:58 +02:00
Rémi Verschelde f20c9c25eb
Merge pull request #28164 from BastiaanOlij/AndroidCameraPermission 
Add camera permissions to android
 2019-04-19 11:27:11 +02:00
Rémi Verschelde 268b520703 doc: Sync classref with current source 2019-04-19 11:21:09 +02:00
Rémi Verschelde 6af69f851a doc: Drop unused <demos> tag 2019-04-19 11:03:46 +02:00
Rémi Verschelde d1c26674eb
Merge pull request #28051 from WindyDarian/no_utf8_for_vs2013 
Ignore '/utf-8' flag on Visual Studio 2013
 2019-04-19 08:41:43 +02:00
Max Hilbrunner 4ad255a078
Merge pull request #28131 from 2bit-hack/patch-1 
Fixed copy&paste error #28117
 2019-04-18 16:36:04 +02:00
Ignacio Roldán Etcheverry 392f1491e1
Merge pull request #28161 from neikeq/exception-hook-no-abort 
Mono: Use exit(status) instead of abort() in exception hook
 2019-04-18 16:26:54 +02:00
Ignacio Roldán Etcheverry 1b3ea697c5
Merge pull request #28165 from neikeq/missing-tostring 
C#: Add missing ToString() override methods
 2019-04-18 15:31:33 +02:00
Bastiaan Olij fab84c7dff Add camera permissions to android 2019-04-18 23:16:41 +10:00
Ignacio Etcheverry 8759c0e31a Mono: Use exit(status) instead of abort() in exception hook 2019-04-18 15:01:50 +02:00
Rémi Verschelde 4f22fde635
Merge pull request #28158 from akien-mga/zstd-1.4.0 
zstd: Update to upstream 1.4.0, remove call to experimental API
 2019-04-18 15:01:32 +02:00
Ignacio Etcheverry 2b9557c920 C#: Add missing ToString() override methods 
Godot.Object, Array, Dictionary and RID were missing ToString() override methods
 2019-04-18 14:48:13 +02:00
Rémi Verschelde 2dee231c8e
Merge pull request #28146 from volzhs/unique_id_android 
Fix get_unique_id() on Android
 2019-04-18 13:53:27 +02:00
Rémi Verschelde 20265879e2 Compression: Set Zstd max window size via public parameter 
`ZSTD_DCtx_setMaxWindowSize` is still part of the experimental API
(thus unexposed in the shared library). Upstream examples seem to
use `ZSTD_d_windowLogSize` instead, so it's probably what we should
use too.

Fixes #17374.
Distro packagers can now unbundle Zstd.
 2019-04-18 13:47:42 +02:00
Ignacio Roldán Etcheverry d1f98ff51b
Merge pull request #28139 from neikeq/mono-log-level-info 
Mono: Logging improvements
 2019-04-18 13:14:02 +02:00
Rémi Verschelde 8f6e548ab0
Merge pull request #28150 from homer666/animationplayer-snap-mode-disable 
Fix AnimationPlayer snap mode dropdown behaviour
 2019-04-18 13:00:37 +02:00
Rémi Verschelde 88cb9bd27f zstd: Update to upstream 1.4.0 
One step towards fixing #17374 as most experimental APIs we use are now
part of the stable 1.4.0.
 2019-04-18 12:39:11 +02:00
homer666 659162ab98 Fix AnimationPlayer snap mode dropdown behaviour 2019-04-18 14:43:48 +10:00
volzhs 5a4b2087a0 Fix get_unique_id() on Android 2019-04-18 08:07:03 +09:00