mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-27 11:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,833 Commits 15 Branches 59 Tags 8.7 GiB
69ef89a8bd
Commit Graph

11833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rémi Verschelde
3a07860311
Merge pull request #14561 from volzhs/libwebp-0.6.1 
Update libwebp to 0.6.1
 2017-12-12 00:14:26 +01:00
Rémi Verschelde
33db6a14df
Merge pull request #14566 from cbscribe/kcc_node_docs 
[DOC] Update Node class ref
 2017-12-12 00:14:07 +01:00
Will Nations
d9cb00151b [DOCS] Camera property changes 2017-12-11 12:48:41 -06:00
Chris Bradfield
6264a52999 [DOC] Update Node class ref 2017-12-11 10:17:09 -08:00
volzhs
043103fe6a Update libwebp to 0.6.1 
* lossless performance and compression improvements + a new 'cruncher' mode (-m 6 -q 100)
* ARM performance improvements with clang (15-20% w/ndk r15c)
* webp-js: emscripten/webassembly based javascript decoder
* miscellaneous bug & build fixes
 2017-12-12 02:55:47 +09:00
bruvzg
5f5c461385
Use MinGW specific binutils for debug symbols separation 2017-12-11 18:12:50 +02:00
volzhs
47182a01c3 Pressing Enter key creates or loads script on Attach script window 2017-12-11 23:20:25 +09:00
Bojidar Marinov
2c190b975e
Properly support nested ternary expressions 
Fixes 14324.
 2017-12-11 15:36:32 +02:00
Ray Koopa
d0ebcb61c8 Highlight Editor Settings categories 2017-12-11 13:13:17 +01:00
Rémi Verschelde
1401b07d32
Merge pull request #14548 from volzhs/fix-out-of-size 
Fix Index p_current=0 error at starting editor
 2017-12-11 13:02:53 +01:00
volzhs
79de82f7d0 Fix Index p_current=0 error at starting editor 2017-12-11 20:46:33 +09:00
Rémi Verschelde
dfb3634c34
Merge pull request #13836 from AndreaCatania/scale 
Fixed bullet scale on get_transform and joints
 2017-12-11 10:35:09 +01:00
Rémi Verschelde
237be766d4 doc: Sync classref with current source 2017-12-11 09:32:25 +01:00
Rémi Verschelde
64d104756c
Merge pull request #14534 from AndreaCatania/patch-2 
Fixed bad bindings
 2017-12-11 08:16:14 +01:00
Rémi Verschelde
2314f0c281
Merge pull request #14543 from volzhs/checkbox-checkbutton-center 
Fix align=center info is not saved with CheckBox & CheckButton
 2017-12-11 08:02:22 +01:00
Rémi Verschelde
378bb89678
Merge pull request #14541 from volzhs/fix-checkbutton 
Fix CheckButton & CheckBox minimum size
 2017-12-11 08:01:54 +01:00
volzhs
1273f10646 Fix align=center info is not saved with CheckBox & CheckButton 2017-12-11 15:53:30 +09:00
Rémi Verschelde
82b702d5da
Merge pull request #14533 from Krakean/addrootifnone_fix 
Fix to #14503
 2017-12-11 07:44:33 +01:00
volzhs
2afa2bc389 Fix CheckBox minimum size 2017-12-11 15:37:29 +09:00
volzhs
3c04d7798c Fix CheckButton minimum size 2017-12-11 14:52:32 +09:00
AndreaCatania
050a7ea6cc Fixed bad bindings 2017-12-11 01:42:16 +01:00
Dmitry Koteroff
cd43188734 Fixed #14503 2017-12-11 02:43:27 +03:00
Rémi Verschelde
c05c66ee01
Merge pull request #14511 from akien-mga/drop_tilemap_center_xy 
TileMap: Drop unused center_x/center_y booleans
 2017-12-11 00:13:26 +01:00
Rémi Verschelde
9e41940652
Merge pull request #14514 from akien-mga/unix_has_data 
Drop unused OS_Unix::has_data and related logic
 2017-12-11 00:13:15 +01:00
Rémi Verschelde
5cfafaf09e
Merge pull request #14516 from AndreaCatania/patch-2 
Implemented physics linear and angular lock
 2017-12-11 00:13:06 +01:00
Rémi Verschelde
dcc5e21b35
Merge pull request #14520 from Smjert/fix/11247/skybox 
Fix skybox generation imprecision with Clang
 2017-12-11 00:12:38 +01:00