Commit graph

626 commits

Author SHA1 Message Date
Juan Linietsky
ecad3a285f better unique name resolution, as suggested i #3017 2015-12-08 11:33:30 -03:00
Juan Linietsky
9637460331 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-08 11:23:23 -03:00
Juan Linietsky
3c33b705d1 added option to add_child, to use the same deduplication convention as in the editor, closes #3017 2015-12-08 11:21:12 -03:00
Rémi Verschelde
2cc60386d8 Merge pull request #3005 from TheHX/pr-file-dialog
Better hidden folders display preferences for editor file dialogs
2015-12-07 20:40:58 +01:00
Rémi Verschelde
c667bde183 Merge pull request #3007 from neikeq/fix_line_edit
Fix LineEdit cursor
2015-12-07 20:39:43 +01:00
neikeq
f499fb6fcf Fix LineEdit cursor 2015-12-07 20:31:21 +01:00
Franklin Sobrinho
42eef3cdc6 Better hidden folders display preferences for editor file dialogs 2015-12-06 19:35:31 -03:00
Juan Linietsky
3ecc9e07b7 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-05 14:19:19 -03:00
Juan Linietsky
200b7bb87c -Display on animation editor which keys are invalid and which tracks are unresolved
-Added a tool to clean up unresolved tracks and unused keys
2015-12-05 14:18:22 -03:00
neikeq
71eaa2d547 Add refresh button to file dialogs 2015-12-04 19:33:30 +01:00
Juan Linietsky
35fa048af5 missing pngs 2015-12-04 10:22:45 -03:00
Rémi Verschelde
68d3438a93 Merge pull request #2975 from neikeq/help_scroll_top
Fix help view not scrolling to the top
2015-12-02 16:16:18 +01:00
Juan Linietsky
064fd762fa Merge branch 'master' of https://github.com/godotengine/godot 2015-12-02 11:17:01 -03:00
Juan Linietsky
4b1f0afb01 -several fixes to Android to work better on Tegra 3/4 devices, uses 16 bits FBOs so all 2D shader effects should now work in every single Android device. 2015-12-02 11:15:48 -03:00
neikeq
11b560d6d4 Fix help view not scrolling to the top 2015-12-02 14:01:46 +01:00
neikeq
c5698fc28e Fix RichTextLabel copy never called 2015-12-02 08:19:33 +01:00
koalefant
c93a005fb6 Script Editor: automatic indentation after a colon 2015-11-29 17:13:29 +01:00
Juan Linietsky
68aaa0f813 Merge branch 'master' of https://github.com/godotengine/godot 2015-11-28 20:57:23 -03:00
Juan Linietsky
7aa39b7cae -Fixed bug with scene inheritance, should work again
-Proper .tscn and .tres parsing, should work, please test well!
2015-11-28 20:56:14 -03:00
Franklin Sobrinho
43e1b879d0 Add container automatic update when moving a child node 2015-11-28 13:05:39 -03:00
Franklin Sobrinho
493d3c22ca Fix editor help scroll to result 2015-11-27 20:11:49 -03:00
Juan Linietsky
b987d2113b 0theora compilation fixes 2015-11-25 00:28:03 -03:00
Juan Linietsky
082e3fbb29 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	main/main.cpp
2015-11-24 10:52:41 -03:00
Juan Linietsky
ccd40f76e8 -work in progress resourceparser and .tscn parser. Still non-functional
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
2015-11-24 10:42:05 -03:00
Rémi Verschelde
2fbc1445a5 Merge pull request #2870 from neikeq/submenu_pos_fix
Popup submenu position enhancement
2015-11-23 11:53:30 +01:00
Rémi Verschelde
aa30e01f26 Merge pull request #2752 from SaracenOne/shadow_color
New shader feature: change the colour of shadows on a per-material basis
2015-11-23 11:40:52 +01:00
neikeq
9797b6374b Popup submenu position enhancement 2015-11-22 15:53:22 +01:00
Franklin Sobrinho
5ef23812ac Add more properties to AcceptDialog 2015-11-20 18:25:01 -03:00
Juan Linietsky
fd5ee87c24 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	platform/windows/export/export.h
2015-11-19 10:44:13 -03:00
Juan Linietsky
d3eb9e8c54 -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260 2015-11-19 10:41:20 -03:00
Franklin Sobrinho
bc3b5847b0 Fix SplitContainer bool properties 2015-11-19 09:56:04 -03:00
Juan Linietsky
b6084a8a62 Merge pull request #2364 from neikeq/textedit_select
Some TextEdit selection improvements
2015-11-19 00:30:39 -03:00
Saracen
dd00452997 Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color
Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp
2015-11-18 23:18:10 +00:00
Juan Linietsky
0c3386b2ed Merge pull request #2707 from akien-mga/master
Cosmetic fixes to SCons buildsystem
2015-11-18 19:43:28 -03:00
Juan Linietsky
3337191d5a Merge pull request #2709 from eska014/fix-default-menubutton-styleboxes
Fix default StyleBoxes of MenuButton
2015-11-18 19:43:02 -03:00
Juan Linietsky
f0aeb036d1 Merge pull request #2715 from SaracenOne/shader_fix_and_enhancement
Write to 4-dimensional position access and shader graph code generation fix.
2015-11-18 19:36:47 -03:00
Juan Linietsky
734e3751c6 Merge pull request #2720 from SaracenOne/bone_attachment_fix
BoneAttachment fix.
2015-11-18 19:33:28 -03:00
Juan Linietsky
6de941f21c Merge pull request #2721 from SaracenOne/animation_tree_player_manual_control
Experimental retooling of AnimationTreePlayer to allow manual advancement
2015-11-18 19:32:37 -03:00
Juan Linietsky
75922c57d6 Merge pull request #2635 from StraToN/tabs-buttons
Fixed bug : both tab buttons appearing hovered
2015-11-18 19:15:13 -03:00
Juan Linietsky
326781f4c9 Merge pull request #2636 from TheHX/fixed_material
Bind missing FixedMaterial constants, fixes #2628
2015-11-18 19:14:48 -03:00
Juan Linietsky
762a76630c Merge pull request #2638 from MarianoGnu/master
add missing default value
2015-11-18 19:14:37 -03:00
Juan Linietsky
a8f18e1bae Merge pull request #2639 from MarianoGnu/origin
Fix ButtonGroup broken layout
2015-11-18 19:14:25 -03:00
Juan Linietsky
d38fd747ab Merge pull request #2672 from Brickcaster/patch-1
Fix for world_to_map() with negative coords.  Fixes issue #2665
2015-11-18 19:07:53 -03:00
Juan Linietsky
c0170d3891 Merge pull request #2695 from eska014/add-default-angular-damp
Set World2D default angular damp per global `physics_2d/default_angular_damp`
2015-11-18 19:01:49 -03:00
Juan Linietsky
b0d3c27d31 Merge pull request #2725 from SaracenOne/line_edit_alignment
nice!
2015-11-18 19:01:04 -03:00
Juan Linietsky
8bbde9e6cc Merge pull request #2730 from TheHX/fix_exp_property
Fix Range exp_edit property
2015-11-18 19:00:19 -03:00
Juan Linietsky
ee944e0da2 Merge pull request #2734 from neikeq/popupmenu_imp
Small PopupMenu behaviour changes
2015-11-18 18:59:56 -03:00
Juan Linietsky
b4f88eb4b6 Merge pull request #2735 from TheHX/fix_tree_checkbox
Fix Tree checkbox check/uncheck behavior
2015-11-18 18:59:02 -03:00
Juan Linietsky
ef6fab88be Merge pull request #2747 from MarianoGnu/line_edit
Add <Select All>(Ctrl+A) shortcut to LineEdit. Fixes #1094
2015-11-18 18:55:59 -03:00
Juan Linietsky
e84fa04141 Merge pull request #2764 from guilhermefelipecgs/fix_camera2d_set_zoom
Fix for smoothing camera2D when you change zoom.
2015-11-18 18:44:50 -03:00