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

6305 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde 719a51b32a Merge pull request #9470 from volzhs/spatial-visibility-changed 
Fix visibility changes for Spatial
 2017-07-03 10:02:51 +02:00
volzhs 7ca40c3eb9 Fix visibility changes for Spatial 2017-07-03 00:02:36 +09:00
Rémi Verschelde 37eaa9d792 EditorNameDialog: Fix margins 
Somehow the previous code is what works in *master*, though it looks buggy.
For 2.1, the margins should be set on the container itself.
 2017-07-02 13:16:39 +02:00
Rémi Verschelde 5a6eaf5a55 EditorNameDialog: Remove unnecessary move_child 
Fixes #9377.

(cherry picked from commit bb6e73f9c1)
 2017-07-02 12:51:07 +02:00
Rémi Verschelde 47307453f7 Script editor help: Prevent loading empty instances from layout 
(cherry picked from commit 71f6c96288)
 2017-07-02 12:31:43 +02:00
Juan Linietsky 026c580399 Changed Vector3.snap from fmod to stepify, which makes more sense, fixes #6399 
(cherry picked from commit 23ababdcd5)
 2017-06-30 23:32:13 +02:00
Juan Linietsky 920f216a14 Small exporter fixes 2017-06-29 07:29:48 -03:00
Rémi Verschelde 1a1b97e059 Revert "Dictionary keys are now sorted by insertion order" 
This reverts commit b8a16fbd0e.

Too cutting edge for the stable branch, it also makes Dictionary
twice slower.
 2017-06-28 08:05:30 +02:00
Rémi Verschelde e3f9653353 Merge pull request #9410 from williamd1k0/advanced-string-format 
Advanced string format (2.1)
 2017-06-27 20:52:27 +02:00
Juan Linietsky b8a16fbd0e Dictionary keys are now sorted by insertion order 
- Cherry-pick from 0a59c3c3a6
 2017-06-26 20:29:17 -03:00
George Marques 92ac3869d3
WinRT: Fix exporting problems 
- Replace spaces with %20, since appx don't like it.
- Use .zip extension for custom package templates.
 2017-06-26 14:51:21 -03:00
geequlim 9d49491afd Fix crash with String copy from with NULL string parameter 
(cherry picked from commit 4b2a44054a)
 2017-06-25 16:18:05 +02:00
Rémi Verschelde 3070267c4c Merge pull request #9364 from Noshyaar/pr-genh21 
BuildSystem: generated files have .gen.ext (2.1)
 2017-06-25 16:08:26 +02:00
Poommetee Ketson 4a0dc529ce BuildSystem: generated files have .gen.ext 2017-06-25 20:31:56 +07:00
Rémi Verschelde 11dc3f8589 i18n: Update template and sync translations 2017-06-25 14:25:46 +02:00
Rémi Verschelde 3683d1501d i18n: Sync translations with Weblate 
Adds Finnish translation.
 2017-06-25 14:23:24 +02:00
Mariano Suligoy bcbd2653de GdScript: Add signal autocompletion to emit_signal function 
(cherry picked from commit 7fe750583e)
 2017-06-25 14:20:47 +02:00
Marcelo Fernandez bcb8cc2faa Fix possible crash in joy_axis (fixes #4944). 
(cherry picked from commit 2419a4e4ff)
 2017-06-25 14:20:47 +02:00
Rémi Verschelde 8d6445b8f3 Merge pull request #7946 from RandomShaper/fix-vis-notifier-2d-2.1 
Fix VisibilityNotifier2D viewport offset issue (2.1)
 2017-06-25 11:21:43 +02:00
Rémi Verschelde c5a44eebf5 Merge pull request #8558 from RandomShaper/tilemap-one-way-collision-2.1 
Add one-way collision to tile-set/tile-map (2.1)
 2017-06-25 11:19:54 +02:00
Rémi Verschelde 5e7fb570e8 Merge pull request #8714 from RandomShaper/fix-owc-2.1 
Fix one-way collision detection (2.1)
 2017-06-25 11:14:31 +02:00
Rémi Verschelde 148a9e384b Merge pull request #8999 from RandomShaper/fix-physics-2.1 
Fix multiple 2D & 3D physics issues (2.1)
 2017-06-25 11:12:37 +02:00
Rémi Verschelde 6b7a8add90 Merge pull request #9356 from volzhs/freetype-2.8-2.1.x 
Update freetype to 2.8 (for 2.1.x)
 2017-06-25 10:42:33 +02:00
volzhs 05443bd5a8 Update freetype to 2.8 2017-06-25 11:16:45 +09:00
Rémi Verschelde eb457d2565 Merge pull request #9315 from dumitru-stama/blitfix 
Fixed a copy-paste bug in blend_rect and blend_rect_mask
 2017-06-24 23:36:07 +02:00
Rémi Verschelde 09f65d7b9e Merge pull request #9351 from dumitru-stama/blitmask 
Added 'blit_rect_mask' method
 2017-06-24 20:07:45 +02:00
George Marques 0a9d482482
WinRT: Add Gamepad vibration support 2017-06-24 13:31:36 -03:00
George Marques fbb4107ec7
WinRT: Fix Gamepad input 
Fix #9216
 2017-06-24 12:22:58 -03:00
dumitru-stama e9e39dd6dc Added 'blit_rect_mask' method 2017-06-24 08:16:35 -07:00
Andreas Haas 4b6e43f67e Merge pull request #9341 from GodotExplorer/pr-rich-text-vscroll-type 
Add type statements for RichTextLabel
 2017-06-24 13:24:58 +00:00
geequlim 82224d0b80 Add type statements for RichTextLabel 2017-06-24 14:10:44 +08:00
dumitru-stama 2036e48ee7 Fixed a copy-paste bug in blend_rect and blend_rect_mask 2017-06-22 07:25:04 -07:00
Rémi Verschelde 1432d575dd Merge pull request #9252 from dumitru-stama/blendfill21 
Added two new methods 'blend_rect_mask' and 'fill'
 2017-06-20 00:38:45 +02:00
Thomas Herzog 2bd3792d6a Merge pull request #8434 from hikari-no-yume/Sprite3D_double_sided_flag 
Add double-sided flag to SpriteBase3D (fixes #8007)
 2017-06-19 23:47:33 +02:00
Rémi Verschelde ba87ef3d12 Merge pull request #9265 from RandomShaper/fix-dbg-regression-2.1 
Fix regression in script debugger (2.1)
 2017-06-19 13:12:32 +02:00
Pedro J. Estébanez 3e5e8b6c9e Fix multiple issues with 2D & 3D physics 
- Use `NOTIFICATION_ENTER`/`EXIT_WORLD` for `Area` (intead of `*_TREE`).
- Now both bodies' and areas' constraints are cleaned up.
- And now also that happens as soon as the space is set to null (i.e., when exiting the tree) instead of only at freeing time.
- When clearing constraints, the loop goes on to the next if the current is already released, instead of breaking.
- When one has been already released, no error is shown from now on, as it's something expected, since a pair (our kind of constraint of interest) can be freed by any of its involved collision objects and the other will try again.
- Implement index shifting (or marking as -1) for shapes indices in collision pairs shapes are removed.
- Standarize behavior of bodies and areas so that anything that invalidates a given pair gives the same result (collision mask, actual collision, etc); for instance, triggering area enter/exit signals.
- Add missing member initializations.
- Extend the new-space-equals-area/body-current-space test to every case.
- Fix 3D ray-casts early accepting Areas (skipping the mask check).
- Fix unpairing of large elements (2D's `BroadPhase2DHashGrid`).

Some of these prevent random crashes caused by constraints with dangling pointers to involved objects.
Fixes #8856.
Fixes #7589.
Fixes #6676.
And maybe others.
 2017-06-19 12:02:50 +02:00
Pedro J. Estébanez 5b4f40666b Fix regression in script debugger 2017-06-19 11:56:16 +02:00
Rémi Verschelde a912ae5762 Merge pull request #9245 from toger5/project_manager_hiDpi 
project manager HiDpi size fix [2.1]
 2017-06-18 20:31:41 +02:00
d 48f8931d48 Added two new methods 'blend_rect_mask' and 'fill' 2017-06-18 10:27:50 -07:00
ageazrael fc27e46af4 Used in the macOS HiDPI options window is too small 
(cherry picked from commit 109ad227d3)
 2017-06-17 16:03:13 -07:00
Pedro J. Estébanez 2018db093c Add one-way collision to tile-set/tile-map 2017-06-17 22:26:50 +02:00
Rémi Verschelde eeb1d94dc9 Bump version to 2.1.4-beta 2017-06-17 14:05:00 +02:00
aswinmohanme 945f40303a Prevent Editor from hang when importing stl as mesh 
When Importing an stl file into Godot from the import mesh menu, the
editor hangs indefinitely. Since only Obj files are supported, the data
remains unparsed and hence the editor enters an infinte loop.

This commit fixes this issue by exiting the loop when godot has finished
parsing the file, irrespective of whether any meaningful data was
extracted out.

Fixes: #9200
 2017-06-17 12:55:46 +02:00
Rémi Verschelde e17966ca01 Merge pull request #9167 from dumitru-stama/blitalpha 
Added new "blend_rect" method as an alpha-aware blit_rect
 2017-06-17 12:54:15 +02:00
dumitru.stama e99d13c6bc Fixed a blit_rect crash with out-of-bounds coords 2017-06-17 12:53:32 +02:00
Kryptocron cb2697e98e Added option to not save a scene when played. 
(cherry picked from commit 4bee1d98fa)
 2017-06-17 12:53:29 +02:00
Rémi Verschelde f1af9f380b Merge pull request #9119 from pixelpicosean/improve-tileset-convert-shape-offset-2.1 
Subtract body position from shape offset during tileset convert
 2017-06-17 12:52:52 +02:00
Rémi Verschelde ff002ada5d Merge pull request #9022 from RandomShaper/improve-mem-class-2.1 
Remove mutex-locking from non-debug memory routines (2.1)
 2017-06-17 12:45:12 +02:00
Bojidar Marinov 9c44d72b3c Fix EditorFileSystem duplicating root folder in new folders 
Also, add some uninitialized variables into constructors (I like to applease cppcheck).
Also, remove unused md_count.
Fixes #3662.

(cherry picked from commit c89d9720f0)
 2017-06-17 12:31:27 +02:00
Rémi Verschelde bc7ceebc19 Add more recent contributors to AUTHORS 
(cherry picked from commit bd33fd0435)
 2017-06-17 12:31:27 +02:00