godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,009 Commits 15 Branches 59 Tags 2.2 GiB
1df63bf3cb
Commit Graph

12009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
fb84b49d87 Fix type mismatch in OS::set_borderless_window 
Closes #14663.
 2017-12-14 19:16:20 +01:00
Rémi Verschelde
e1b374d5b6
Merge pull request #14662 from akien-mga/openmp-clang 
openmp: Don't try to link GCC's implementation on Clang
 2017-12-14 19:05:06 +01:00
Rémi Verschelde
ab9cda1497 openmp: Don't try to link GCC's implementation on Clang 
Also disable openmp build on Travis, breaks on Trusty's Clang.
Group deps more naturally.
 2017-12-14 18:27:56 +01:00
Matthias Hoelzl
ce24b149d3 Prevent users from moving instanced children 2017-12-14 17:49:02 +01:00
Rémi Verschelde
b872439eef
Merge pull request #14657 from Valentactive/fix_compiling_new_lightmapper 
fix for compiling the new lightmapper
 2017-12-14 16:27:38 +01:00
Rémi Verschelde
ccea45e4fd
Merge pull request #14658 from bruvzg/macports-clang 
Adds `macports_clang` build flag.
 2017-12-14 16:09:08 +01:00
bruvzg
f8303ec6fb
Adds macports_clang build flag to build using clang-5.0 form MacPorts (with OpenMP support). 2017-12-14 16:44:45 +02:00
Michele Valente
dea5ba3991 fix for compiling the new lightmapper 
also changed two calls that were ambiguous
 2017-12-14 15:32:53 +01:00
Rémi Verschelde
9fab381141
Merge pull request #14654 from ColinKinloch/master 
Fixed inconsistent use of tabs and spaces in indentation.
 2017-12-14 15:01:34 +01:00
Arnaud PEZEL
6f114c50a7 Fixes built-In "LIGHT" causing fragment compilation error 
Add a rename for shader LIGHT built-in, Fix bug #14537
 2017-12-14 14:58:13 +01:00
Colin Kinloch
edb1df15ea Added indent_style to editorconfig, fixed inconsistent use of tabs and spaces in indentation. 2017-12-14 13:52:23 +00:00
Juan Linietsky
f3ad14224e -Add lightmapper 
-Fixes to unwrapper (remove degenerates), makes Thekla not crash
-Added optional cancel button in EditorProgress
-Added function to force processing of events (needed for cancel button)
 2017-12-14 09:01:27 -03:00
mhilbrunner
966c054fc9 HTTP cleanup & better defaults 2017-12-14 10:59:42 +01:00
Will Nations
3533e01eab [DOCS] Animation, CanvasItem, Curve3D, Curve 2017-12-13 23:05:56 -06:00
Will Nations
c38cd9b963 Added open_script_create_dialog func 2017-12-13 22:14:17 -06:00
volzhs
ac411c9f48 Focus path field after seleting file browser on Attach script window 2017-12-14 11:25:00 +09:00
Rémi Verschelde
aa6772d7ab Revert property changes in "[DOCS] AnimationPlayer new props, members/methods" 
This partially reverts commits e79456519d
and 2d07fe2920, which introduced API changes
needing more in-depth review at this stage.

Kept the removal of "get_position" binding, redundant with
"get_current_animation_position". Kept docs changes where applicable.
Also removed the obsolete "stop_all" method which does the same as "stop".

Fixes #14602.
 2017-12-14 00:36:41 +01:00
Rémi Verschelde
592ce20fc5
Merge pull request #14638 from mhilbrunner/patch-7 
[DOCS] JSON: Small fixes
 2017-12-13 22:32:35 +01:00
Rémi Verschelde
8771329f55
Merge pull request #14633 from poke1024/fix-richtextlabel-crash 
Fix crash (and bug) in RichTextLabel
 2017-12-13 22:03:52 +01:00
Max Hilbrunner
a187345603 [DOCS] JSON: Small fixes 2017-12-13 21:54:32 +01:00
poke1024
f08768c189 Fix crash (and bug) in RichTextLabel 2017-12-13 20:22:47 +01:00
Rémi Verschelde
1c0007ba71
Merge pull request #14626 from Hinsbart/module_env 
Scons: Build modules in seperate env.
 2017-12-13 16:57:12 +01:00
Andreas Haas
34e489f060
TileMapEditor: Fix tile placement. 
Fixes #14625
 2017-12-13 16:46:22 +01:00
Andreas Haas
0e624234da
Scons: Build modules in seperate env. 2017-12-13 15:46:35 +01:00
volzhs
e8cc25a855 Fix theme for Mesh menu 2017-12-13 21:26:55 +09:00
Rémi Verschelde
b110813134
Merge pull request #14499 from akien-mga/glsl-bone-type 
Fix usage of signed type in skeleton shader
 2017-12-13 08:37:56 +01:00
Rémi Verschelde
88a3e15981
Merge pull request #14587 from hoelzl/pr-no-std-arg-on-msvc 
Don't pass -std=gnu++11 to MSVC
 2017-12-13 08:37:33 +01:00
Rémi Verschelde
729af16aa9
Merge pull request #14591 from mhilbrunner/patch-6 
Small fix in stream_peer_openssl: missing break, formatting
 2017-12-13 08:37:13 +01:00
Rémi Verschelde
a104a9b95b
Merge pull request #14593 from Hinsbart/mono_env 
Mono: Build in cloned env.
 2017-12-13 08:36:57 +01:00
Rémi Verschelde
b0aeecc02b
Merge pull request #14596 from Noshyaar/pr 
Enhance undoredo action name, TTR, cleanup
 2017-12-13 08:36:47 +01:00
Przemyslaw Czarnota
08c8d46593 Fix #14564 ImmediateGeometry normals act strangely compared to SurfaceTool 2017-12-13 07:45:24 +01:00
Zaven Muradyan
f139d0e4e6 Account for folded code blocks when navigating via members list 
Previously, the editor would attempt to set the scroll position to the
function's line number, but this would result in an invalid scroll
whenever functions above the target were folded.

This changes callback to use a combination of `goto_line` and
`set_edit_state` to navigate to the target line and reset the cursor to
column 0.

Using `goto_line` also has the side effect of automatically unfolding
the target function, which seems like useful behavior.

Fixes #14572.
 2017-12-12 21:40:12 -08:00
sersoong
2c7131e5ac Enhanced Merge From Scene 2017-12-13 12:38:35 +08:00
Noshyaar
c68b031b05
Merge pull request #14603 from YeldhamDev/tileset_button 
Fixed Tileset editor button having the wrong text and not being translatable
 2017-12-13 11:11:28 +07:00
Nathan Warden
f89d78a7a4 Updated Linux template extensions to match architecture. 2017-12-12 16:09:48 -05:00
Michael Alexsander Silva Dias
a933b927ca Fixed Tileset editor button having the wrong text and not being translatable. 2017-12-12 17:06:44 -02:00
Matthias Hoelzl
26a1621678 Change -std=gnu++11 to -stc=c++11 and don't pass flag to MSVC 2017-12-12 18:58:51 +01:00
Rémi Verschelde
fb12d700c9
Merge pull request #14595 from hpvb/fix-mingw-build 
Fix mingw build for thekla_atlas
 2017-12-12 17:54:09 +01:00
Hein-Pieter van Braam
5387613c7b Fix mingw build for thekla_atlas 2017-12-12 17:30:43 +01:00
Poommetee Ketson
24df9f3707 Enhance undoredo action name, TTR, cleanup 2017-12-12 23:04:37 +07:00
Andreas Haas
e7c1255b06
Mono: Build in cloned env. 
Use a cloned env, so that toggling glue_enabled doesn't force a full rebuild as mentioned in #14584.
 2017-12-12 16:20:34 +01:00
Max Hilbrunner
d5df834b89
stream_peer_openssl: add missing break & format 2017-12-12 13:35:34 +01:00
Noshyaar
55962ce28f
Merge pull request #14530 from mhilbrunner/add-http 
HTTPClient: Add PATCH method and missing HTTP status codes
 2017-12-12 19:06:25 +07:00
Noshyaar
0b990d3ef5
Merge pull request #14474 from toger5/fixSliderNan 
added missing NaN check fixes: #13255
 2017-12-12 19:01:40 +07:00
mhilbrunner
a7abb459c9 HTTPClient: Add PATCH method and missing HTTP status codes 2017-12-12 10:56:18 +01:00
Rémi Verschelde
56a44ca03e
Merge pull request #14581 from Noshyaar/pr 
Change statable to multistate, remove extra separator
 2017-12-12 07:59:08 +01:00
Poommetee Ketson
9888a56639 Change statable to multistate, remove extra separator 2017-12-12 09:41:17 +07:00
Rémi Verschelde
36ce7c444d
Merge pull request #14549 from RayKoopa/highlight_settings_categories 
Highlight Editor Settings categories
 2017-12-12 00:16:51 +01:00
Rémi Verschelde
f15c255916
Merge pull request #14565 from bruvzg/mingw-specific-binutils 
Use MinGW specific binutils for debug symbols separation.
 2017-12-12 00:15:26 +01:00
Rémi Verschelde
8cd4b9bf27
Merge pull request #14555 from bojidar-bg/14324-nested-ternary 
Properly support nested ternary expressions
 2017-12-12 00:14:36 +01:00