From 4a7114262343e39235569525b7939896f806b4e6 Mon Sep 17 00:00:00 2001
From: quabug <quabug@gmail.com>
Date: Wed, 3 Dec 2014 12:17:23 +0800
Subject: [PATCH 01/14] Add move_child_notify method in Node class

---
 scene/main/node.cpp | 6 ++++++
 scene/main/node.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 292e4d1a7b..4163e6a1b8 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -271,6 +271,7 @@ void Node::move_child(Node *p_child,int p_pos) {
 		data.children[i]->data.pos=i;
 	}
 	// notification second
+    move_child_notify(p_child);
 	for (int i=0;i<data.children.size();i++) {
 		data.children[i]->notification( NOTIFICATION_MOVED_IN_PARENT );
 
@@ -310,6 +311,11 @@ void Node::remove_child_notify(Node *p_child) {
 	// to be used when not wanted	
 }
 
+void Node::move_child_notify(Node *p_child) {
+
+	// to be used when not wanted	
+}
+
 void Node::set_fixed_process(bool p_process) {
 	
 	if (data.fixed_process==p_process)
diff --git a/scene/main/node.h b/scene/main/node.h
index 9229e2f9bb..371a5325ca 100644
--- a/scene/main/node.h
+++ b/scene/main/node.h
@@ -142,6 +142,7 @@ protected:
 	
 	virtual void add_child_notify(Node *p_child);
 	virtual void remove_child_notify(Node *p_child);
+	virtual void move_child_notify(Node *p_child);
 	void remove_and_delete_child(Node *p_child);
 	
 	void _propagate_replace_owner(Node *p_owner,Node* p_by_owner); 

From 25f8f5339a803d55d448d1760b5e8671e0946509 Mon Sep 17 00:00:00 2001
From: quabug <quabug@gmail.com>
Date: Wed, 3 Dec 2014 13:29:28 +0800
Subject: [PATCH 02/14] use tab instead of space

---
 scene/main/node.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 4163e6a1b8..45a30d7bca 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -271,7 +271,7 @@ void Node::move_child(Node *p_child,int p_pos) {
 		data.children[i]->data.pos=i;
 	}
 	// notification second
-    move_child_notify(p_child);
+	move_child_notify(p_child);
 	for (int i=0;i<data.children.size();i++) {
 		data.children[i]->notification( NOTIFICATION_MOVED_IN_PARENT );
 

From c79be979d47daae613d1b1bbc732a30a74f56543 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Sun, 7 Dec 2014 02:04:20 -0300
Subject: [PATCH 03/14] Batch of Bugfixes -=-=-=-=-=-=-=-=-

-Fixed Export UV XForm (should work now). #923
-Fixed enforcement of limits in property editor. #919
-Fixed long-standing bug of export editings in script inheritance. #914, #859, #756
-Fixed horrible error reporting in shader language. #912
-Added kinematic collision with plane (please test well). #911
-Fixed double animation track insert when using 2D rigs. #904
-VKey updates offset parameter in sprite edition. #901
-Do not allow anymore a script to preload itself. (does not fix #899, but narrows it down)
-Avoid connection editor from overriding selected text. #897
-Fixed timer autostart. #876
-Fixed collision layers in 3D physics. #872
-Improved operators in shader #857
-Fixed ambient lighting bug #834
-Avoid editor from processing gamepad input #813
-Added not keyword #752

Please test!
---
 demos/3d/truck_town/crane.scn                 | Bin 23916 -> 24164 bytes
 doc/base/classes.xml                          | 201 +++++++++++++-----
 drivers/gles2/rasterizer_gles2.cpp            |   4 +-
 drivers/gles2/shaders/material.glsl           |   2 +-
 modules/gdscript/gd_editor.cpp                |   2 +-
 modules/gdscript/gd_parser.cpp                |  16 +-
 modules/gdscript/gd_parser.h                  |   5 +-
 modules/gdscript/gd_script.cpp                | 164 +++++++++++---
 modules/gdscript/gd_script.h                  |  13 +-
 scene/2d/animated_sprite.cpp                  |   7 +-
 scene/2d/area_2d.cpp                          |  15 ++
 scene/2d/area_2d.h                            |   1 +
 scene/2d/polygon_2d.cpp                       |   1 +
 scene/2d/sprite.cpp                           |   6 +
 scene/3d/area.cpp                             |  18 ++
 scene/3d/area.h                               |   1 +
 scene/3d/light.cpp                            |   4 +-
 scene/3d/sprite_3d.cpp                        |  10 +
 scene/3d/visual_instance.cpp                  |   8 +-
 scene/gui/tree.cpp                            |   7 +
 scene/main/scene_main_loop.cpp                |   3 +
 scene/main/timer.cpp                          |   3 +-
 scene/scene_string_names.cpp                  |   2 +
 scene/scene_string_names.h                    |   1 +
 servers/physics/body_pair_sw.cpp              |   2 +-
 servers/physics/collision_solver_sw.cpp       |  44 +++-
 servers/physics/collision_solver_sw.h         |   1 +
 servers/visual/rasterizer.cpp                 |   2 +-
 servers/visual/shader_language.cpp            |  16 +-
 tools/editor/animation_editor.cpp             |   7 +
 tools/editor/editor_node.cpp                  |   2 +
 .../plugins/polygon_2d_editor_plugin.cpp      |   9 +
 tools/editor/plugins/script_editor_plugin.cpp |   2 +-
 tools/editor/plugins/shader_editor_plugin.cpp |   5 +-
 .../blender25/io_scene_dae/export_dae.py      |  24 ++-
 35 files changed, 492 insertions(+), 116 deletions(-)

diff --git a/demos/3d/truck_town/crane.scn b/demos/3d/truck_town/crane.scn
index 080bd8ea172a1f6b657167f4e31f80984a031123..2c4645af69f41aa1026bd27abec1c86f401c1b30 100644
GIT binary patch
delta 6543
zcmaE}i}A@GM$e#NXJ-Zw5MW^V@t%R9ik*R>mW6?VpOt~(7#jnFBr5~MaSjHCyX*`M
z|5+FqTv-?x^w}5~cCj)rXmT<z$Z#+)#IZ6k?4IZ;&-v(`g1`eK1_sxSg%XU);tv=k
z1(Wl05{rrwE8{bZ<BN;ZlNf{)q}U1)ixP8-^%YtsPh(WAFJsB9NKJ`v=;bOcPK{5@
zDac4<kWq+!z%HrKz?5GUpU}+6ApL+#o~0l^Gp|IEo4G2LLFxgU99v3eadKi&%7PdM
z*#~U04rLq_mGOD`MY)MN3cnML7Tjb`$xKUAkWbQFAjDE!keXbo$o+s>m?bqgv$$Bv
znUO(6A^HKEdOdS|YDK|AW(Llb)RM%^ocP?#iU-WP4YdsMiN=Ya54bvRVkmmRtl1#Q
z5T78QT$8}bQmmhzlmCz<;~^8j(|(rHviOQLg-47Gf(nZmN|f>$N|jn4Fx+?8{(xPC
zDZV5*;qe1T@r0d884uWm9kiVIA25hLWKdxceZZW1K=c8}<aJCu@{1mD#3n{DNIu|6
zR4j2YbIyIhV3w%(faRZqpo5wV$K;z#>WmX7GcqgGd$1NIreu~DCvY)lq&lxpyw4h+
zRGOEPqr&cL?Q(=6IK?gbpyEqbD}DX6{2V1E#`t8FVwR#rz4Vj^%&Lx}4XR7i9ONBd
zF>opDWXZ`-PRvnoU@~Ah?GT~B@PJvA$&lg011?b}BZhPb6$J(dwgZk##thL;nP6FF
z6NY+!IRzmI$CSZY1I9LEFgJp+%^B92z}OZHs^&1ZCByDC5ZiI;ftk#P1`IDAaEmb;
zGSuWKXelr}V9{kVVps?gGG_Rn2NhyAVYpwRAPkZgV>V^j-=t6v<(M(d?}15}Gt^Im
zu`L+x&VaEk8LVf6+00@rMg|OqdqEr*VGgJKir|dIf>Z|g^UnL-Pjmn16SLptu*t48
zy5HW}j={}!A**j<NorB1vM7VLf|ZkwyR@780SRV30|Ud!%UA^J-2xAAI~yI~c0P81
z+jYMKw}ZRuEBA*E3~pi$+z#TdM;TZgL=+gDY#sC+7#QRgSPpPADlj}?<YrKOz{Jg<
z1R|6bxSb}mcSJSYt@xZ~r@*Jcz}#T3!q6bDz`$VtfRUNG!CsZ&0fYDhCXj?0!-0M#
z4=42p4BU(j_VrGO4{T=CWN6@aU|`TvU|F!A!QL^%LD_+UK}Uh5L7ch4UYDUUhk-$X
zn}Oj03&R6Zenvfp#%Koy27LvV1JMiy3fzvx4h#&23M>c2odXYuGZ;T$5_b+hAkJX=
zfJvOeOo97=xO3tGcLoa(*Am2Kuu|YYpwD2fz<r=zoWTYxWD6plVwinXi!%}g4&{2P
zF(s82D`hYmGdM1FQej|IFmcdvzMo;qT%2E2@{r-5gQU}9mfZZJf{YGJhT<e`2L=Zj
zXJ*YmO*b7noGhGT9Aq4r8S+%M6F3~)9<jV~kaZ~KC@9Lz%`C|*OHEkqxWhrxRUm_X
zWkbG0x>NdQZMIy-AW3c}1_lN;1_p+Tef9PVYzYhxq`6rb7#j97JYZmWAj-}5uIB%~
zr3JAG@eicA6&RT9^)|&Gh<_l#tq{$yUm={qPQm<v47WnGLpNB3BLC*k>?ar*%_r~S
zlw~b(3~>B2xt~90vlmwwqpHg{2ZjfA+zbqv;TqW<;tyoF9T*h74;+6W!_COR@KW@7
z14D!I<fGi7^&By~s`tKjt=jvWyD@Vgh|}>wYhSwpvjaE79|d9NbFNi;K?%Xuft#UK
zL7utsgO;5GH`^7Ej>gOcZsy0XRkjY?%x1f)Z67eZKVar&eC?W`&#=!y`2jQc0c(d~
z5EbvB52CEW6ys6Xgyw{Juz)UD<iKeM2p7y_Xj1sj)cZjTsst>y(3!#3A%6049y7-K
zlmGF^P5x;rxLKFimI>^CX=by8lFgm`OBtoDJ~J^eC@?cHFtjKzJ1{UXDX=gwE?{P0
zQDC3E+el^d4f83JPYWK`Hg{})z|Y|5&f^9u)gk#PF(=`n<60+8$6iP-GD<9R{NyAz
z`Jj+QJt+4$ZgN`Wz~HzFlzSX^IVCwTIPL=F9mi7#xE&82;C8%pfZOpA2s>#pb6;1s
zKfuh)z|dgt_{>3EfkA=)05fBQy%W;{P;LRS_!{~dJ)E568bG<lN$kL8Cp8Cd2L>m#
z24zMDdndC4;!b)E;vkiF5{@YO#3{=$+JV8T>Ol15JYj=+r(FlcolYGPf22~zV4T?J
zc+N@e(eg6pS;2L72bdWc6t6w{TlOfo%;hp93vf7>I|#V#17(7g`-%%wX1l#|kal~<
z0j|?PSs<y&fx$u2Rf-#&2jamsV{ytNP&RP)Wyn1m;Pn5{9#AG=&P&WqO)%$haC^#>
z$Y7Wtf}9bOja~E|%-uIVV9Iw$ce%&ls4T&yzL>%OC#Qt{nUeJmM>hwGq%qfXoheyw
zr@okBKV$qtemh5_lKqvH>iZkY`|Z@8<v(EH=JW4S+7FWdAGgrX)IlzRn?3KQm(^3Q
zKl>c?8B=aFaLa2wn!2wraGqW7*ZKCP8h7^{({Qvq=d#>>Z`;*<HqT$$viE;kW6%D&
zZl8lSvv$jNdk1TwkC{Do5q$IP6@{2s_lKUgw%gpi>;a4Q1Loid%#(N9Wicyub4=bK
zA*I3=pm4>GF@9m<eFttf0mg-PymiwOk3VF(%wP}77yA$BJH&7PBk`2kl&NB0J@@{-
zCBl0c7#JEV_SHX-;N~`qtFpiFJ=iW^sM+d)G&gtV#N53n%j)cfn-AE6_>*~M0}UM4
zGcYtTB<=>04+OXw7!(-Tra5=-TkKkvp#8v`n@x1xaXb0eY)AJ865J2?_fPJUwPk$0
z`GjmD3x~JG0d9u93i6wcm0mM3`cIZuEp+7v1@qJ=t@dfVoa{iYCXS^Q9rkypPO@WA
zVBiLYf9cu>pfI<0;AT2gvOa;E9i&>QWzjwdaR+Xuv|UaK;*(FSYE3@wCg`FN%&`9f
zQ!vAR2X}{Zg}w(2{R&(R3<s7U&|lD>pzl!bAb!Bwf%`zPLO;X41N{o+4Eqk0EA%t$
zKhUqRoMHcg<qXOS*^}$lZg4O-DzGz1DKJltRbMKd)W*E>FoXR8ZU<#ZoG3rw=5~m8
z5O;2xET>_~q!={GQ+{%VMu3Wwi1WJ#{0z>C+|G#w#ico^;94=co54vz*EyKw>=_?h
z=gDt0BsAE93o=rRQW@M*T;v_B9i*IBKGBkQFng@>z@b<ORMK8aoa(^9z%W@$^BI%l
zp~*s8cNz63f6%gEa?zNqrG13mDaT>)1Ad0dAGOt3wG{jvmQ9w@kpX9Y25AKoCp!lQ
z1{nnwQ1)k#Rp55=a$xY{1{DC1%G2HX05_u|xB>;$oi6Jfwu5WVMUtGh3Q`ITj1BhQ
zdZ3cP(QpCoij$?mUW0+*0mEhn%>~>J437G?3-&YGYbyviTt}%mo8*Y9I48f>v9p5I
zgN_vk#9g>D#2oiH6*~#I2s=nPFMgrL>~!r7hqBW(hhR{h_J&WH!7xGAq4b4{6N87s
z?aBIV8udKAAGG$F?W*2;)V0bMTu*>F;7VfwHw&!35C_#44CfT2LD>Sex?sHGnqUpB
zD-_&0?P7LS+cGp|+C5j`ci>hCX0THTP7r7KuOQFN;8wNQLHq%;{sDIf@dNP=+zXl$
zl-(C_Cs->4CoFeRKCs_`8&ZF8vo?Luvg`fOaQcA0!{*8V4b3DR-alaGe!#4Jz}-QA
zq4`5*=L86EvLd_Q=0kdsOoEV7--#bw4kn&(NSN$zQm}cBAwQ$mx%*5F_6(r%njwLK
zrNN$ofgypLZD~R5eg*~x2WC*!%fMi-VC-N&d5Zay$!wgBlcR*VCRyrW8oJrv<Pf7X
z14G+$2L`p*X`dY!9u#ncN{94x1%?MT;QY-Bs_peQWq=HJU{E;jx(eJNU}9isIPhHo
z)E;o?KQY-*UsS-&7G!s{!|R0o52U#j`6t(ysn)*~xvU`Xz>uKqS^j{V*<<y~zxPp4
z_I;*m+dpEBnfpK$IH+<4hqr5$EvSlrzzmKyJ5V*Rd;k<k4&n#&9k|*5H)h&_qd@rp
zw}Uv-pT^9DY*2K7B59vOJh)b8<4!0SbkJ82f55=a@K|9n)9=R2g#OJ2yjD#0knqK*
zRqr}RI^J|*bzFFW+p!i@#W}7$!0lLhfZMSXgu!*|Os7r<2FHn@%;mVy$<u+saUm#c
zIc_|_?YQy)x8qJIKIyO>TDLMVD6e%q3(8Q?s@2i=C9H0B{0gaCS;2Ly<KF|Dop?bO
zJMlv5R@npMPNI;yRn?ghIVU*<f~(fV1JRSeSQ^wjEj%FZwDExWqm!|S`gHH3zp;;U
zW8F@J(@}DoVsA>G+Y$!}w*`ng^a+ECgQQy$Y86@vu0q)va*uL3U2=(YyMw4iIUL-M
znt<Ex$hD|)S!yzy3zLJndk&-;-N<lEp#rrUog644JNb?kH)Hzb7gjlps+&WteHnu}
z;5D2$6RSP6hO=k8!eY<V@z{2|-CBFa2TbA)+-%#@EbLTItxiyuGgEtQtJJs-RE63h
zRiSpEDzyL0nuN)XVxrR7516eTKuP96Hn_5!?ZADY*+Kb0wuJg5TV*z8P|e~nS<5z(
zhe^9-d%|f4Zimwj&6E3V6(=i+i%mXitI2qM@_SngCU*JB+IDKp4v!rs2id9A$2<IX
zP<DuS;C{$_Upbp$-(#lD4EqjmcH(!icKq&O?Qq&*zw&Q}{g0V8KVX1V)7HxU4;X@#
zmow}?;_ndb&<|=u20Ms@+@<fpefY71{t;mZ?g!lc4%d%3J2Znh2Ofi6e;^o4J>-^m
za0jtxJ8*ASwzp%h=h0(eU@%}{V9;k^V9*1#A`KOo84MJd8H^N|8B7$I8H~X#V^alo
z2Yv=+1$G8a1!e{{u$T&1%uIou!9szV!5l1R2^O<bU}vyVU}mrei`jz3>=f8pKy{Hl
zSj-V5#^N;joRi+<{qkIV41NmC48C9~e+Bl<lFl=k*qv81Nii@aP2TNVCvapPI0=9%
z?X+D^F20-n-Le=}m=qWoGMF3~oZo>uS<d?$_?-{AeL8&1dAI8~=S$8X9QYliC*OB3
zXZG0VFgemAh(+lYE5qb<9tW9xJSP`=S~EF`Oy1xr%Hp%u`Pt^vo_iSU`9WPK&%EN2
z#JuEG20;b}5r*{C{M^)%qDuX;%;L<XoKyyB28IWWB0{;~u4rOTe12JKQBh_}Drn?D
zjwd;>xFo(fBQYhvoI&ydvjkgFYI163S?U65hT;dTraVQ7dFiR~NvY|Xc?`l2SWFWn
zm{Rjn9<YjWBxUA!=OpDP7NtC3b$h@d#u#7ufK`GcCAFX=BfdB}QQ<6u+ymzL1&?^*
zGxOpTb8_N~^7C_xAFys`EG<@;!JU|$ni8LrnVwO?AoGCPZnB@x0Vc(%lZAYZLzH5e
z^Yel;6tox_*c9xQj1@Q?{&18OWu~X67BL7Yh%!0mWhxaYXfOmMtWU^fC{W;HNlHx4
z)>q_XOHM5=j?c|kYIU6cfI*TyB{eOvG^Zq9Y47HlzKV<*OvU**DzS<Wm@@N=6y_$j
zvqHv@lpixD7AH9`;Acun%uRUd(mMI6pB<B;#bi}~RW`=5MAay!$pQX)Lawuz<Kt6P
zoD7-c3vx<TD;VM@_xmT-J5O~Ga_LllnL1r{7ek5aSBD^`nwts_7~B}DT!kD&m>C#;
zIXf6TaJ!m2uro6-m^e8IJ0vleWu}%phcs3>$U5pd{d7=tIP{c3&_RaT^Yt4C2ML#*
z3>6O538KuIX=!!`L>Vd{Fo-fYyz$%bAnM?v@|CG1HBaS)W4z-92Z?%@7mf-HsZW{O
z9poJt9ONCIJIE`4X3NM=&(BNDdB7s)(9c+q-+GGMe39M$dlfo%zIh@C9*7(ORb~&k
z4mdD46gpgczzAZ9KHvaR5)YgXJYZ&c@b|!j;scI%JPsX}RZCINa_%~`+d)>jIXySI
zBWczFSq2fsa~h`@>N7PW8)Q|!Gvuh<cMxZuHB%DYtx^8#knP;bTAYzz9-poi`GCdK
z`E!D#nt;lh2Q1P~YZ<E2_BnGgpFMNN*1_B3<bj#Ypn<&vBTy0S9HbzVu+e!1V|+z|
zHItQFVM05Dgo650206x}QdMcj)Dra`hV-ZGvJO+1?`3vNEJ`m<h;lg0s+*&rQk<;(
zB0<pE+`;7`gN*}&L+ewXR+i+V)YLrHRtE*gOqDNgtPTv0Vb2s8x$N%kQZ!Go)0}^J
z?-8HLwt?cpX$}kx?2HOd4eX2!_733=@vdf*(*w<U8D=RtIq)m^GB`G{GfrL`7|i%%
zGGmYolPAMu`5+IKM-BXpC!8GJ8U8CUI81h!?XZ7QHG{Z<K~ptDnohn-sBW09*W~V?
z<@LNBhXidwO@0VwV_*OaJYZsYz|PMgp&-q`q`=I;rNGP}sK5*wez0eFz{J45adCwG
z^AwK#4nhj-4E7HE4&3ZIt9<P_I3DhQplr;h_57EeD9i5$JjQH1pP$%m|CN%E4po@W
zK56L`yDd392Oe;zvrTRZR?@xCz_5UyGxzCY`yP$0`^6X<`9a-pM_~p=1@;Hb!VKIB
z{0_nl%nIxd%ns_4&jibaGx9Jrgg;PrXS0%4wQpPc_5q7K1MdSZcXqSh&33|jnGQT)
ze$K%6K+B!&&y_eks~Ay`0{#c;?ywM!&a69dXtrbVLuGOHBQwP87fhUI>o|LIMTi3%
zqX5HW#?O=Yhln#d^H07JqQ>S@>A>ymIhifgkjwd~gR+yWgS2zzWY<td#_-AMp-PNb
zH+O|jVdU~!=bG($*;U``(`KFUDn>ze&<HdLbNv7R|34c8!{nC{hJp<73d|1P3=#_L
z4)zb&y&3E#Yem)wGKe~`C@?T6DKIm{Dlj|TW|+J!Qklt7c=GK?t9o#SA`KdzIIx+)
zS%Jra*<rIou*2qu?EQ}M2R1(xzs;Dy(BSQG`~kN&gS~?M0q=*iZ#x`!V0gIr_JPfg
z*BzK2+TUhKROE2*c8Gt-eVfUFf#Knj+lRT~@{awF&9^foDQ<UQcJOvdf5?5C!BIi^
z@OFk|1#SjcCk1AP6a{97W`<M+b{BDmGzE6o&kX4b?5@QO84BzU{tuWL9MTyw6$Bm#
zXEV4d$Uk7tc1U)}W^h*!f1sYtkfmV!KzQ=PD6x81?+4=78L}1hK?=PP3cVG?8B!IP
zA1G%t<Uk~S5R$$M;t!OwouV0X6^tFS83YvAA8|`F_$i1V$bKq(+5NYZxcltq?CTl$
z6`Y;49g-c`83Y&bGYBcLyB~J<cWicGaMyQWU=UYeVW<~VV0M`8?)`v!w)^)3vt72k
zi@OUufclu$9{kS14*3i+3j7ZF46+LB9`X!w3hW-~4Dt%>?)r=h3=R1ViVN5s7~D5I
zFt|7$=yq^+=ysUzknV8%K(oVg4|a#c4$=<x4%44oe|B8$sO)gx{j<mI=gglSiX9jn
zrZX5Sa6A;QH}~W}u-Re0!)k|chvbLW<{q~l7#z(HbRRT#tar$F>_5=_FxlLT`60hK
zgOS3Phr;Gw<_9)EWHxs=|Ipgpiy5ZaX}&|c(|WLCZ|#Tt=1j&63=c)jy+MhA+5C}x
zzPC0^sk6AFxq~!VsZX%WLvC}2eg;;BEl&9dRv%G!5Py)p+UNTN?$z##9he<fJ8pLQ
z|AyV&_4|R%Zm-?=J@i3iX$&6940#Fy4&H9u54gR3(<j%(DDnEGvKJ?(=B36PrzDh3
fUK>-!<R~y%HP(VZaW}iMv9WznaFBCQu(LA&Atfo}

delta 6244
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

diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 2c49926d66..35de0106b5 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -3281,6 +3281,12 @@
 			<description>
 			</description>
 		</method>
+		<method name="get_overlapping_bodies" qualifiers="const" >
+			<return type="Array">
+			</return>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<signals>
 		<signal name="body_enter">
@@ -3418,6 +3424,12 @@
 			<description>
 			</description>
 		</method>
+		<method name="get_overlapping_bodies" qualifiers="const" >
+			<return type="Array">
+			</return>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<signals>
 		<signal name="body_enter">
@@ -4828,6 +4840,10 @@
 		</method>
 	</methods>
 	<signals>
+		<signal name="released">
+			<description>
+			</description>
+		</signal>
 		<signal name="toggled">
 			<argument index="0" name="pressed" type="bool">
 			</argument>
@@ -11647,6 +11663,14 @@
 			<description>
 			</description>
 		</method>
+		<method name="save_png"  >
+			<return type="int">
+			</return>
+			<argument index="0" name="path" type="String" default="0">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 		<constant name="COMPRESS_BC" value="0">
@@ -15474,14 +15498,12 @@
         Finally, when a node is freed, it will free all its children nodes too.
 	</description>
 	<methods>
-		<method name="_enter_scene" qualifiers="virtual" >
+		<method name="_enter_tree" qualifiers="virtual" >
 			<description>
-			Called when entered the scene.
 			</description>
 		</method>
-		<method name="_exit_scene" qualifiers="virtual" >
+		<method name="_exit_tree" qualifiers="virtual" >
 			<description>
-			Called when being removed from the scene.
 			</description>
 		</method>
 		<method name="_fixed_process" qualifiers="virtual" >
@@ -15634,11 +15656,10 @@
 			<description>
 			</description>
 		</method>
-		<method name="is_inside_scene" qualifiers="const" >
+		<method name="is_inside_tree" qualifiers="const" >
 			<return type="bool">
 			</return>
 			<description>
-			Return wether the node is inside a scene tree (a tree where the topmost node is a [RootNode])
 			</description>
 		</method>
 		<method name="is_a_parent_of" qualifiers="const" >
@@ -15882,11 +15903,10 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_scene" qualifiers="const" >
-			<return type="SceneMainLoop">
+		<method name="get_tree" qualifiers="const" >
+			<return type="SceneTree">
 			</return>
 			<description>
-			Get the current SceneMainLoop. Only returned if the node is inside the scene, else returns null.
 			</description>
 		</method>
 		<method name="duplicate" qualifiers="const" >
@@ -15917,28 +15937,24 @@
 		</method>
 	</methods>
 	<signals>
-		<signal name="enter_scene">
-			<description>
-			Emitted when the node enters the scene.
-			</description>
-		</signal>
 		<signal name="renamed">
 			<description>
 			Emitted when the node is renamed.
 			</description>
 		</signal>
-		<signal name="exit_scene">
+		<signal name="enter_tree">
+			<description>
+			</description>
+		</signal>
+		<signal name="exit_tree">
 			<description>
-			Emitted when the node exits the scene.
 			</description>
 		</signal>
 	</signals>
 	<constants>
-		<constant name="NOTIFICATION_ENTER_SCENE" value="10">
-			Notification received when the node enters the Scene Tree and gains access to the [RootNode]. Note that children nodes will not have received the notification at that time yet.
+		<constant name="NOTIFICATION_ENTER_TREE" value="10">
 		</constant>
-		<constant name="NOTIFICATION_EXIT_SCENE" value="11">
-			Notification received when the node exits the Scene Tree and loses access to the [RootNode]. Note that parent nodes will not have received the notification at that time yet.
+		<constant name="NOTIFICATION_EXIT_TREE" value="11">
 		</constant>
 		<constant name="NOTIFICATION_MOVED_IN_PARENT" value="12">
 		</constant>
@@ -16554,6 +16570,10 @@
 			</argument>
 			<argument index="1" name="arg1" type="float">
 			</argument>
+			<argument index="2" name="arg2" type="int">
+			</argument>
+			<argument index="3" name="arg3" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -17334,7 +17354,7 @@
 		<method name="put_var"  >
 			<return type="int">
 			</return>
-			<argument index="0" name="var" type="Variant">
+			<argument index="0" name="var" type="var">
 			</argument>
 			<description>
 			</description>
@@ -17368,6 +17388,70 @@
 	<constants>
 	</constants>
 </class>
+<class name="PacketPeerUDP" inherits="PacketPeer" category="Core">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<methods>
+		<method name="listen"  >
+			<return type="int">
+			</return>
+			<argument index="0" name="port" type="int">
+			</argument>
+			<argument index="1" name="recv_buf_size" type="int" default="65536">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="close"  >
+			<description>
+			</description>
+		</method>
+		<method name="wait"  >
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="is_listening" qualifiers="const" >
+			<return type="bool">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_packet_ip" qualifiers="const" >
+			<return type="String">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_packet_address" qualifiers="const" >
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_packet_port" qualifiers="const" >
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="set_send_address"  >
+			<return type="int">
+			</return>
+			<argument index="0" name="host" type="String">
+			</argument>
+			<argument index="1" name="port" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
+	</methods>
+	<constants>
+	</constants>
+</class>
 <class name="Panel" inherits="Control" category="Core">
 	<brief_description>
 	Provides an opaque background for [Control] children.
@@ -18039,6 +18123,30 @@
 			<description>
 			</description>
 		</method>
+		<method name="set_h_frames"  >
+			<argument index="0" name="enable" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="get_h_frames" qualifiers="const" >
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="set_v_frames"  >
+			<argument index="0" name="enable" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="get_v_frames" qualifiers="const" >
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
 		<method name="set_emission_half_extents"  >
 			<argument index="0" name="extents" type="Vector2">
 			</argument>
@@ -18173,7 +18281,7 @@
 		</constant>
 		<constant name="PARAM_HUE_VARIATION" value="13">
 		</constant>
-		<constant name="PARAM_MAX" value="14">
+		<constant name="PARAM_MAX" value="16">
 		</constant>
 		<constant name="MAX_COLOR_PHASES" value="4">
 		</constant>
@@ -19534,7 +19642,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="free"  >
+		<method name="free_rid"  >
 			<argument index="0" name="rid" type="RID">
 			</argument>
 			<description>
@@ -20994,7 +21102,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="free"  >
+		<method name="free_rid"  >
 			<argument index="0" name="rid" type="RID">
 			</argument>
 			<description>
@@ -24091,6 +24199,12 @@
 			<description>
 			</description>
 		</method>
+		<method name="get_colliding_bodies" qualifiers="const" >
+			<return type="Array">
+			</return>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<signals>
 		<signal name="body_enter">
@@ -24364,6 +24478,12 @@
 			Return true if the body has the ability to fall asleep when not moving. See [set_can_sleep].
 			</description>
 		</method>
+		<method name="get_colliding_bodies" qualifiers="const" >
+			<return type="Array">
+			</return>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<signals>
 		<signal name="body_enter">
@@ -25275,13 +25395,10 @@
 		</constant>
 	</constants>
 </class>
-<class name="SceneMainLoop" inherits="MainLoop" category="Core">
+<class name="SceneTree" inherits="MainLoop" category="Core">
 	<brief_description>
-	Scene-Based implementation of the MainLoop.
 	</brief_description>
 	<description>
-	Scene implementation of the MainLoop. All scenes edited using the editor are loaded with this main loop, which provides the base for the scene system.[br]
-	All group operations (get nodes, call, etc) is performed here. All nodes in a group can be called a specific functions, set a property or notified. This happens in scene-order.
 	</description>
 	<methods>
 		<method name="notify_group"  >
@@ -25292,7 +25409,6 @@
 			<argument index="2" name="notification" type="int">
 			</argument>
 			<description>
-			Call a notification in all the nodes belonging to a given group. See GROUP_CALL_* enum for options.
 			</description>
 		</method>
 		<method name="set_group"  >
@@ -25305,7 +25421,6 @@
 			<argument index="3" name="value" type="var">
 			</argument>
 			<description>
-			Set a property in all the nodes belonging to a given group. See GROUP_CALL_* enum for options.
 			</description>
 		</method>
 		<method name="get_nodes_in_group"  >
@@ -25314,7 +25429,6 @@
 			<argument index="0" name="arg0" type="String">
 			</argument>
 			<description>
-			Get all the nods belonging to a given group.
 			</description>
 		</method>
 		<method name="get_root" qualifiers="const" >
@@ -25327,21 +25441,18 @@
 			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
-			Set to true if the application will quit automatically when quit is requested (Alt-f4 or ctrl-c).
 			</description>
 		</method>
 		<method name="set_editor_hint"  >
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set to true to tell nodes and the scene that it is being edited. This is used by editors, not release.
 			</description>
 		</method>
 		<method name="is_editor_hint" qualifiers="const" >
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the scene is being run inside an editor.
 			</description>
 		</method>
 		<method name="set_edited_scene_root"  >
@@ -25360,19 +25471,16 @@
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set pause. The built-in pause system is very basic and only meant to avoid processing nodes not allowed to work in pause mode.
 			</description>
 		</method>
 		<method name="is_paused" qualifiers="const" >
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the scene is paused.
 			</description>
 		</method>
 		<method name="set_input_as_handled"  >
 			<description>
-			Handle a current input event (avoid further processing of it).
 			</description>
 		</method>
 		<method name="get_node_count" qualifiers="const" >
@@ -25385,12 +25493,10 @@
 			<return type="int">
 			</return>
 			<description>
-			Return the frame index (how many frames were drawn).
 			</description>
 		</method>
 		<method name="quit"  >
 			<description>
-			Quit the application.
 			</description>
 		</method>
 		<method name="set_screen_stretch"  >
@@ -25407,7 +25513,6 @@
 			<argument index="0" name="obj" type="Object">
 			</argument>
 			<description>
-			Queue an object for deletion next time the loop goes idle.
 			</description>
 		</method>
 		<method name="call_group"  >
@@ -25428,41 +25533,33 @@
 			<argument index="7" name="arg4" type="var" default="NULL">
 			</argument>
 			<description>
-			Call a function for all the nodes in a given group.
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="screen_resized">
 			<description>
-			Emitted when the screen changes size.
 			</description>
 		</signal>
 		<signal name="node_removed">
 			<argument index="0" name="node" type="Object">
 			</argument>
 			<description>
-			Emitted when a node is removed from the scene.
 			</description>
 		</signal>
 		<signal name="tree_changed">
 			<description>
-			Emitted when the scene tree changed (nodes added/removed/moved/etc)
 			</description>
 		</signal>
 	</signals>
 	<constants>
 		<constant name="GROUP_CALL_DEFAULT" value="0">
-			Regular group call flag (no flags).
 		</constant>
 		<constant name="GROUP_CALL_REVERSE" value="1">
-			Call a group in inverse-scene order.
 		</constant>
 		<constant name="GROUP_CALL_REALTIME" value="2">
-			Call a group immediately (usually calls are delivered on idle).
 		</constant>
 		<constant name="GROUP_CALL_UNIQUE" value="4">
-			Call a group only once, even if call is performed many times.
 		</constant>
 		<constant name="STRETCH_MODE_DISABLED" value="0">
 		</constant>
@@ -32543,7 +32640,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_pos" qualifiers="const" >
+		<method name="get_stream_pos" qualifiers="const" >
 			<return type="float">
 			</return>
 			<description>
@@ -32601,6 +32698,12 @@
 			<description>
 			</description>
 		</method>
+		<method name="set_audio_track"  >
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp
index 057de329df..9f2fd032fa 100644
--- a/drivers/gles2/rasterizer_gles2.cpp
+++ b/drivers/gles2/rasterizer_gles2.cpp
@@ -4648,7 +4648,8 @@ void RasterizerGLES2::_add_geometry( const Geometry* p_geometry, const InstanceD
 	if (m->flags[VS::MATERIAL_FLAG_INVERT_FACES])
 		e->mirror=!e->mirror;
 
-	e->light_type=0xFF; // no lights!
+	//e->light_type=0xFF; // no lights!
+	e->light_type=3; //light type 3 is no light?
 	e->light=0xFFFF;
 
 	if (!shadow && !has_blend_alpha && has_alpha && m->depth_draw_mode==VS::MATERIAL_DEPTH_DRAW_OPAQUE_PRE_PASS_ALPHA) {
@@ -9122,6 +9123,7 @@ void RasterizerGLES2::init() {
 	use_anisotropic_filter=true;
 	float_linear_supported=true;
 	float_supported=true;
+	use_rgba_shadowmaps=false;
 
 	glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,&anisotropic_level);
 	anisotropic_level=MIN(anisotropic_level,float(GLOBAL_DEF("rasterizer/anisotropic_filter_level",4.0)));
diff --git a/drivers/gles2/shaders/material.glsl b/drivers/gles2/shaders/material.glsl
index 7d9aca4b4d..f2d9eaf1e5 100644
--- a/drivers/gles2/shaders/material.glsl
+++ b/drivers/gles2/shaders/material.glsl
@@ -1214,7 +1214,7 @@ LIGHT_SHADER_CODE
 # if !defined(LIGHT_TYPE_DIRECTIONAL) && !defined(LIGHT_TYPE_OMNI) && !defined (LIGHT_TYPE_SPOT)
 //none
 #ifndef SHADELESS
-	diffuse.rgb=vec3(0.0,0.0,0.0);
+	diffuse.rgb=ambient_light *diffuse.rgb;
 #endif
 
 # endif
diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp
index b1db087fb3..95bae2d32a 100644
--- a/modules/gdscript/gd_editor.cpp
+++ b/modules/gdscript/gd_editor.cpp
@@ -66,7 +66,7 @@ bool GDScriptLanguage::validate(const String& p_script, int &r_line_error,int &r
 
 	GDParser parser;
 
-	Error err = parser.parse(p_script,p_path.get_base_dir(),true);
+	Error err = parser.parse(p_script,p_path.get_base_dir(),true,p_path);
 	if (err) {
 		r_line_error=parser.get_error_line();
 		r_col_error=parser.get_error_column();
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp
index de2b5219a9..904b6ba52f 100644
--- a/modules/gdscript/gd_parser.cpp
+++ b/modules/gdscript/gd_parser.cpp
@@ -225,7 +225,14 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
 			String path = tokenizer->get_token_constant();
 			if (!path.is_abs_path() && base_path!="")
 				path=base_path+"/"+path;
-			path = path.replace("///","//");
+			path = path.replace("///","//").simplify_path();
+			if (path==self_path) {
+
+				_set_error("Can't preload itself (use 'get_script()').");
+				return NULL;
+
+			}
+
 
 			Ref<Resource> res;
 			if (!validating) {
@@ -2616,8 +2623,9 @@ Error GDParser::_parse(const String& p_base_path) {
 	return OK;
 }
 
-Error GDParser::parse_bytecode(const Vector<uint8_t> &p_bytecode,const String& p_base_path) {
+Error GDParser::parse_bytecode(const Vector<uint8_t> &p_bytecode,const String& p_base_path, const String &p_self_path) {
 
+	self_path=p_self_path;
 	GDTokenizerBuffer *tb = memnew( GDTokenizerBuffer );
 	tb->set_code_buffer(p_bytecode);
 	tokenizer=tb;
@@ -2628,9 +2636,9 @@ Error GDParser::parse_bytecode(const Vector<uint8_t> &p_bytecode,const String& p
 }
 
 
-Error GDParser::parse(const String& p_code,const String& p_base_path,bool p_just_validate) {
-
+Error GDParser::parse(const String& p_code, const String& p_base_path, bool p_just_validate, const String &p_self_path) {
 
+	self_path=p_self_path;
 	GDTokenizerText *tt = memnew( GDTokenizerText );
 	tt->set_code(p_code);
 
diff --git a/modules/gdscript/gd_parser.h b/modules/gdscript/gd_parser.h
index 5fac34396c..3f82cafc61 100644
--- a/modules/gdscript/gd_parser.h
+++ b/modules/gdscript/gd_parser.h
@@ -373,6 +373,7 @@ private:
 	List<int> tab_level;
 
 	String base_path;
+	String self_path;
 
 	PropertyInfo current_export;
 
@@ -398,8 +399,8 @@ public:
 	String get_error() const;
 	int get_error_line() const;
 	int get_error_column() const;
-	Error parse(const String& p_code, const String& p_base_path="", bool p_just_validate=false);
-	Error parse_bytecode(const Vector<uint8_t> &p_bytecode,const String& p_base_path="");
+	Error parse(const String& p_code, const String& p_base_path="", bool p_just_validate=false,const String& p_self_path="");
+	Error parse_bytecode(const Vector<uint8_t> &p_bytecode,const String& p_base_path="",const String& p_self_path="");
 
 	const Node *get_parse_tree() const;
 
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index 7085ae6a56..b19168f536 100644
--- a/modules/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
@@ -1523,6 +1523,7 @@ void GDScript::_placeholder_erased(PlaceHolderScriptInstance *p_placeholder) {
 	placeholders.erase(p_placeholder);
 }
 
+/*
 void GDScript::_update_placeholder(PlaceHolderScriptInstance *p_placeholder) {
 
 
@@ -1563,7 +1564,7 @@ void GDScript::_update_placeholder(PlaceHolderScriptInstance *p_placeholder) {
 
 	p_placeholder->update(plist,default_values);
 
-}
+}*/
 #endif
 ScriptInstance* GDScript::instance_create(Object *p_this) {
 
@@ -1582,7 +1583,8 @@ ScriptInstance* GDScript::instance_create(Object *p_this) {
 		}*/
 		PlaceHolderScriptInstance *si = memnew( PlaceHolderScriptInstance(GDScriptLanguage::get_singleton(),Ref<Script>(this),p_this) );
 		placeholders.insert(si);
-		_update_placeholder(si);
+		//_update_placeholder(si);
+		_update_exports();
 		return si;
 #else
 		return NULL;
@@ -1623,61 +1625,136 @@ String GDScript::get_source_code() const {
 }
 void GDScript::set_source_code(const String& p_code) {
 
+	if (source==p_code)
+		return;
 	source=p_code;
+#ifdef TOOLS_ENABLED
+	source_changed_cache=true;
+	//print_line("SC CHANGED "+get_path());
+#endif
+
 }
 
+#ifdef TOOLS_ENABLED
+void GDScript::_update_exports_values(Map<StringName,Variant>& values, List<PropertyInfo> &propnames) {
 
-void GDScript::_update_exports(Set<PlaceHolderScriptInstance*> *p_instances) {
+	if (base_cache.is_valid()) {
+		base_cache->_update_exports_values(values,propnames);
+	}
+
+	for(Map<StringName,Variant>::Element *E=member_default_values_cache.front();E;E=E->next()) {
+		values[E->key()]=E->get();
+	}
+
+	for (List<PropertyInfo>::Element *E=members_cache.front();E;E=E->next()) {
+		propnames.push_back(E->get());
+	}
+
+}
+#endif
+
+bool GDScript::_update_exports() {
 
 #ifdef TOOLS_ENABLED
 
-	String basedir=path;
+	bool changed=false;
 
-	if (basedir=="")
-		basedir=get_path();
+	if (source_changed_cache) {
+		//print_line("updating source for "+get_path());
+		source_changed_cache=false;
+		changed=true;
 
-	if (basedir!="")
-		basedir=basedir.get_base_dir();
+		String basedir=path;
 
-	GDParser parser;
-	Error err = parser.parse(source,basedir,true);
-	if (err)
-		return; //do none
+		if (basedir=="")
+			basedir=get_path();
 
-	const GDParser::Node* root = parser.get_parse_tree();
-	ERR_FAIL_COND(root->type!=GDParser::Node::TYPE_CLASS);
+		if (basedir!="")
+			basedir=basedir.get_base_dir();
+
+		GDParser parser;
+		Error err = parser.parse(source,basedir,true,path);
+
+		if (err==OK) {
+
+			const GDParser::Node* root = parser.get_parse_tree();
+			ERR_FAIL_COND_V(root->type!=GDParser::Node::TYPE_CLASS,false);
+
+			const GDParser::ClassNode *c = static_cast<const GDParser::ClassNode*>(root);
+
+			if (base_cache.is_valid()) {
+				base_cache->inheriters_cache.erase(get_instance_ID());
+				base_cache=Ref<GDScript>();
+			}
 
 
+			if (c->extends_used && String(c->extends_file)!="") {
 
-	const GDParser::ClassNode *c = static_cast<const GDParser::ClassNode*>(root);
+				String path = c->extends_file;
+				if (path.is_rel_path()) {
 
-	if (c->extends_used && String(c->extends_file)!="") {
+					String base = get_path();
+					if (base=="" || base.is_rel_path()) {
 
-		Ref<GDScript> bf = ResourceLoader::load(c->extends_file);
-		if (bf.is_valid()) {
+						ERR_PRINT(("Could not resolve relative path for parent class: "+path).utf8().get_data());
+					} else {
+						path=base.get_base_dir().plus_file(path);
+					}
+				}
 
-			bf->_update_exports(p_instances);
+				Ref<GDScript> bf = ResourceLoader::load(path);
 
+				if (bf.is_valid()) {
+
+					//print_line("parent is: "+bf->get_path());
+					base_cache=bf;
+					bf->inheriters_cache.insert(get_instance_ID());
+
+					//bf->_update_exports(p_instances,true,false);
+
+				}
+			}
+
+			members_cache.clear();;
+			member_default_values_cache.clear();
+
+			for(int i=0;i<c->variables.size();i++) {
+				if (c->variables[i]._export.type==Variant::NIL)
+					continue;
+
+				members_cache.push_back(c->variables[i]._export);
+				//print_line("found "+c->variables[i]._export.name);
+				member_default_values_cache[c->variables[i].identifier]=c->variables[i].default_value;
+			}
+		}
+	} else {
+		//print_line("unchaged is "+get_path());
+
+	}
+
+	if (base_cache.is_valid()) {
+		if (base_cache->_update_exports()) {
+			changed = true;
 		}
 	}
 
-	List<PropertyInfo> plist;
+	if (/*changed &&*/ placeholders.size()) { //hm :(
 
-	Map<StringName,Variant> default_values;
+		//print_line("updating placeholders for "+get_path());
 
-	for(int i=0;i<c->variables.size();i++) {
-		if (c->variables[i]._export.type==Variant::NIL)
-			continue;
+		//update placeholders if any
+		Map<StringName,Variant> values;
+		List<PropertyInfo> propnames;
+		_update_exports_values(values,propnames);
 
-		plist.push_back(c->variables[i]._export);
-		default_values[c->variables[i].identifier]=c->variables[i].default_value;
+		for (Set<PlaceHolderScriptInstance*>::Element *E=placeholders.front();E;E=E->next()) {
+
+			E->get()->update(propnames,values);
+		}
 	}
 
+	return changed;
 
-	for (Set<PlaceHolderScriptInstance*>::Element *E=p_instances->front();E;E=E->next()) {
-
-		E->get()->update(plist,default_values);
-	}
 #endif
 }
 
@@ -1685,8 +1762,20 @@ void GDScript::update_exports() {
 
 #ifdef TOOLS_ENABLED
 
-	_update_exports(&placeholders);
+	_update_exports();
 
+	Set<ObjectID> copy=inheriters_cache; //might get modified
+
+	//print_line("update exports for "+get_path()+" ic: "+itos(copy.size()));
+	for(Set<ObjectID>::Element *E=copy.front();E;E=E->next()) {
+		Object *id=ObjectDB::get_instance(E->get());
+		if (!id)
+			continue;
+		GDScript *s=id->cast_to<GDScript>();
+		if (!s)
+			continue;
+		s->update_exports();
+	}
 
 #endif
 }
@@ -1718,7 +1807,7 @@ Error GDScript::reload() {
 
 	valid=false;
 	GDParser parser;
-	Error err = parser.parse(source,basedir);
+	Error err = parser.parse(source,basedir,false,path);
 	if (err) {
 		if (ScriptDebugger::get_singleton()) {
 			GDScriptLanguage::get_singleton()->debug_break_parse(get_path(),parser.get_error_line(),"Parser Error: "+parser.get_error());
@@ -1746,10 +1835,10 @@ Error GDScript::reload() {
 	}
 
 #ifdef TOOLS_ENABLED
-	for (Set<PlaceHolderScriptInstance*>::Element *E=placeholders.front();E;E=E->next()) {
+	/*for (Set<PlaceHolderScriptInstance*>::Element *E=placeholders.front();E;E=E->next()) {
 
 		_update_placeholder(E->get());
-	}
+	}*/
 #endif
 	return OK;
 }
@@ -1892,7 +1981,7 @@ Error GDScript::load_byte_code(const String& p_path) {
 
 	valid=false;
 	GDParser parser;
-	Error err = parser.parse_bytecode(bytecode,basedir);
+	Error err = parser.parse_bytecode(bytecode,basedir,get_path());
 	if (err) {
 		_err_print_error("GDScript::load_byte_code",path.empty()?"built-in":(const char*)path.utf8().get_data(),parser.get_error_line(),("Parse Error: "+parser.get_error()).utf8().get_data());
 		ERR_FAIL_V(ERR_PARSE_ERROR);
@@ -1945,6 +2034,8 @@ Error GDScript::load_source_code(const String& p_path) {
 	}
 
 	source=s;
+	source_changed_cache=true;
+	//print_line("LSC :"+get_path());
 	path=p_path;
 	return OK;
 
@@ -1986,6 +2077,9 @@ GDScript::GDScript() {
 	_base=NULL;
 	_owner=NULL;
 	tool=false;
+#ifdef TOOLS_ENABLED
+	source_changed_cache=false;
+#endif
 
 }
 
diff --git a/modules/gdscript/gd_script.h b/modules/gdscript/gd_script.h
index 3b183a41b6..f4e4dffaa5 100644
--- a/modules/gdscript/gd_script.h
+++ b/modules/gdscript/gd_script.h
@@ -245,7 +245,16 @@ friend class GDScriptLanguage;
 	Map<StringName,Ref<GDScript> > subclasses;	
 
 #ifdef TOOLS_ENABLED
+
 	Map<StringName,Variant> member_default_values;
+
+	List<PropertyInfo> members_cache;
+	Map<StringName,Variant> member_default_values_cache;
+	Ref<GDScript> base_cache;
+	Set<ObjectID> inheriters_cache;
+	bool source_changed_cache;
+	void _update_exports_values(Map<StringName,Variant>& values, List<PropertyInfo> &propnames);
+
 #endif
 	Map<StringName,PropertyInfo> member_info;
 
@@ -265,13 +274,13 @@ friend class GDScriptLanguage;
 
 #ifdef TOOLS_ENABLED
 	Set<PlaceHolderScriptInstance*> placeholders;
-	void _update_placeholder(PlaceHolderScriptInstance *p_placeholder);
+	//void _update_placeholder(PlaceHolderScriptInstance *p_placeholder);
 	virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder);
 #endif
 
 
 
-	void _update_exports(Set<PlaceHolderScriptInstance *> *p_instances);
+	bool _update_exports();
 
 protected:
 	bool _get(const StringName& p_name,Variant &r_ret) const;
diff --git a/scene/2d/animated_sprite.cpp b/scene/2d/animated_sprite.cpp
index 316dffb3f9..2fcfc18429 100644
--- a/scene/2d/animated_sprite.cpp
+++ b/scene/2d/animated_sprite.cpp
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "animated_sprite.h"
-
+#include "scene/scene_string_names.h"
 void AnimatedSprite::edit_set_pivot(const Point2& p_pivot) {
 
 	set_offset(p_pivot);
@@ -207,7 +207,7 @@ void AnimatedSprite::set_frame(int p_frame) {
 	frame=p_frame;
 	update();
 	_change_notify("frame");
-
+	emit_signal(SceneStringNames::get_singleton()->frame_changed);
 
 }
 int AnimatedSprite::get_frame() const {
@@ -233,6 +233,7 @@ void AnimatedSprite::set_offset(const Point2& p_offset) {
 	offset=p_offset;
 	update();
 	item_rect_changed();
+	_change_notify("offset");
 }
 Point2 AnimatedSprite::get_offset() const {
 
@@ -325,6 +326,8 @@ void AnimatedSprite::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_res_changed"),&AnimatedSprite::_res_changed);
 
+	ADD_SIGNAL(MethodInfo("frame_changed"));
+
 	ADD_PROPERTYNZ( PropertyInfo( Variant::OBJECT, "frames",PROPERTY_HINT_RESOURCE_TYPE,"SpriteFrames"), _SCS("set_sprite_frames"),_SCS("get_sprite_frames"));
 	ADD_PROPERTYNZ( PropertyInfo( Variant::INT, "frame"), _SCS("set_frame"),_SCS("get_frame"));
 	ADD_PROPERTY( PropertyInfo( Variant::BOOL, "centered"), _SCS("set_centered"),_SCS("is_centered"));
diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp
index 3114106235..68dcfcb875 100644
--- a/scene/2d/area_2d.cpp
+++ b/scene/2d/area_2d.cpp
@@ -142,6 +142,8 @@ void Area2D::_body_inout(int p_status,const RID& p_body, int p_instance, int p_b
 
 	ERR_FAIL_COND(!body_in && !E);
 
+	locked=true;
+
 	if (body_in) {
 		if (!E) {
 
@@ -197,11 +199,18 @@ void Area2D::_body_inout(int p_status,const RID& p_body, int p_instance, int p_b
 
 	}
 
+	locked=false;
+
+
 }
 
 
 void Area2D::_clear_monitoring() {
 
+	if (locked) {
+		ERR_EXPLAIN("This function can't be used during the in/out signal.");
+	}
+	ERR_FAIL_COND(locked);
 
 	Map<ObjectID,BodyState> bmcopy = body_map;
 	body_map.clear();
@@ -243,6 +252,11 @@ void Area2D::_notification(int p_what) {
 
 void Area2D::set_enable_monitoring(bool p_enable) {
 
+	if (locked) {
+		ERR_EXPLAIN("This function can't be used during the in/out signal.");
+	}
+	ERR_FAIL_COND(locked);
+
 	if (p_enable==monitoring)
 		return;
 
@@ -336,6 +350,7 @@ Area2D::Area2D() : CollisionObject2D(Physics2DServer::get_singleton()->area_crea
 	set_gravity_vector(Vector2(0,1));
 	gravity_is_point=false;
 	density=0.1;
+	locked=true;
 	priority=0;
 	monitoring=false;
 	set_enable_monitoring(true);
diff --git a/scene/2d/area_2d.h b/scene/2d/area_2d.h
index c6210e7c9a..2044cc7db0 100644
--- a/scene/2d/area_2d.h
+++ b/scene/2d/area_2d.h
@@ -52,6 +52,7 @@ private:
 	real_t density;
 	int priority;
 	bool monitoring;
+	bool locked;
 
 	void _body_inout(int p_status,const RID& p_body, int p_instance, int p_body_shape,int p_area_shape);
 
diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp
index 2b4be734af..217a98aaea 100644
--- a/scene/2d/polygon_2d.cpp
+++ b/scene/2d/polygon_2d.cpp
@@ -359,5 +359,6 @@ Polygon2D::Polygon2D() {
 	tex_rot=0;
 	tex_tile=true;
 	tex_scale=Vector2(1,1);
+	color=Color(1,1,1);
 	rect_cache_dirty=true;
 }
diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp
index 9f789a7a1f..82f5a6972a 100644
--- a/scene/2d/sprite.cpp
+++ b/scene/2d/sprite.cpp
@@ -34,6 +34,7 @@
 void Sprite::edit_set_pivot(const Point2& p_pivot) {
 
 	set_offset(p_pivot);
+
 }
 
 Point2 Sprite::edit_get_pivot() const {
@@ -136,6 +137,7 @@ void Sprite::set_offset(const Point2& p_offset) {
 	offset=p_offset;
 	update();
 	item_rect_changed();
+	_change_notify("offset");
 }
 Point2 Sprite::get_offset() const {
 
@@ -199,6 +201,8 @@ void Sprite::set_frame(int p_frame) {
 		item_rect_changed();
 
 	frame=p_frame;
+
+	emit_signal(SceneStringNames::get_singleton()->frame_changed);
 }
 
 int Sprite::get_frame() const {
@@ -307,6 +311,8 @@ void Sprite::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_modulate","modulate"),&Sprite::set_modulate);
 	ObjectTypeDB::bind_method(_MD("get_modulate"),&Sprite::get_modulate);
 
+	ADD_SIGNAL(MethodInfo("frame_changed"));
+
 	ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_texture"),_SCS("get_texture"));
 	ADD_PROPERTY( PropertyInfo( Variant::BOOL, "centered"), _SCS("set_centered"),_SCS("is_centered"));
 	ADD_PROPERTY( PropertyInfo( Variant::VECTOR2, "offset"), _SCS("set_offset"),_SCS("get_offset"));
diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp
index cb1df78fda..9cdd24d102 100644
--- a/scene/3d/area.cpp
+++ b/scene/3d/area.cpp
@@ -115,6 +115,7 @@ void Area::_body_enter_tree(ObjectID p_id) {
 
 void Area::_body_exit_tree(ObjectID p_id) {
 
+
 	Object *obj = ObjectDB::get_instance(p_id);
 	Node *node = obj ? obj->cast_to<Node>() : NULL;
 	ERR_FAIL_COND(!node);
@@ -132,6 +133,7 @@ void Area::_body_exit_tree(ObjectID p_id) {
 
 void Area::_body_inout(int p_status,const RID& p_body, int p_instance, int p_body_shape,int p_area_shape) {
 
+
 	bool body_in = p_status==PhysicsServer::AREA_BODY_ADDED;
 	ObjectID objid=p_instance;
 
@@ -142,6 +144,8 @@ void Area::_body_inout(int p_status,const RID& p_body, int p_instance, int p_bod
 
 	ERR_FAIL_COND(!body_in && !E);
 
+	locked=true;
+
 	if (body_in) {
 		if (!E) {
 
@@ -197,11 +201,19 @@ void Area::_body_inout(int p_status,const RID& p_body, int p_instance, int p_bod
 
 	}
 
+	locked=false;
+
+
 }
 
 
 void Area::_clear_monitoring() {
 
+	if (locked) {
+		ERR_EXPLAIN("This function can't be used during the in/out signal.");
+	}
+	ERR_FAIL_COND(locked);
+
 	Map<ObjectID,BodyState> bmcopy = body_map;
 	body_map.clear();
 	//disconnect all monitored stuff
@@ -235,6 +247,11 @@ void Area::_notification(int p_what) {
 
 void Area::set_enable_monitoring(bool p_enable) {
 
+	if (locked) {
+		ERR_EXPLAIN("This function can't be used during the in/out signal.");
+	}
+	ERR_FAIL_COND(locked);
+
 	if (p_enable==monitoring)
 		return;
 
@@ -325,6 +342,7 @@ Area::Area() : CollisionObject(PhysicsServer::get_singleton()->area_create(),tru
 
 	space_override=SPACE_OVERRIDE_DISABLED;
 	set_gravity(9.8);;
+	locked=false;
 	set_gravity_vector(Vector3(0,-1,0));
 	gravity_is_point=false;
 	density=0.1;
diff --git a/scene/3d/area.h b/scene/3d/area.h
index 4707b73e1c..40c6d24b5c 100644
--- a/scene/3d/area.h
+++ b/scene/3d/area.h
@@ -52,6 +52,7 @@ private:
 	real_t density;
 	int priority;
 	bool monitoring;
+	bool locked;
 
 
 	void _body_inout(int p_status,const RID& p_body, int p_instance, int p_body_shape,int p_area_shape);
diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp
index 9d959cb0d6..15e77e5378 100644
--- a/scene/3d/light.cpp
+++ b/scene/3d/light.cpp
@@ -415,11 +415,11 @@ void Light::approximate_opengl_attenuation(float p_constant, float p_linear, flo
 
 	float energy=1.0;
 
-	if (p_constant>0)
+	/*if (p_constant>0)
 		energy=1.0/p_constant; //energy is this
 	else
 		energy=8.0; // some high number..
-
+*/
 
 	if (radius==10000)
 		radius=100; //bug?
diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp
index a6a8919d13..77f2cf5cc1 100644
--- a/scene/3d/sprite_3d.cpp
+++ b/scene/3d/sprite_3d.cpp
@@ -275,6 +275,9 @@ void SpriteBase3D::_bind_methods() {
 	BIND_CONSTANT( ALPHA_CUT_DISABLED );
 	BIND_CONSTANT( ALPHA_CUT_DISCARD );
 	BIND_CONSTANT( ALPHA_CUT_OPAQUE_PREPASS );
+
+
+
 }
 
 
@@ -494,6 +497,8 @@ void Sprite3D::set_frame(int p_frame) {
 
 	frame=p_frame;
 	_queue_update();
+	ADD_SIGNAL(MethodInfo("frame_changed"));
+
 }
 
 int Sprite3D::get_frame() const {
@@ -579,6 +584,8 @@ void Sprite3D::_bind_methods() {
 	ADD_PROPERTY( PropertyInfo( Variant::BOOL, "region"), _SCS("set_region"),_SCS("is_region"));
 	ADD_PROPERTY( PropertyInfo( Variant::RECT2, "region_rect"), _SCS("set_region_rect"),_SCS("get_region_rect"));
 
+	ADD_SIGNAL(MethodInfo("frame_changed"));
+
 }
 
 Sprite3D::Sprite3D() {
@@ -722,6 +729,8 @@ void AnimatedSprite3D::_bind_methods(){
 	ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "frames", PROPERTY_HINT_RESOURCE_TYPE,"SpriteFrames"), _SCS("set_sprite_frames"),_SCS("get_sprite_frames"));
 	ADD_PROPERTY( PropertyInfo( Variant::INT, "frame"), _SCS("set_frame"),_SCS("get_frame"));
 
+	ADD_SIGNAL(MethodInfo("frame_changed"));
+
 }
 
 
@@ -764,6 +773,7 @@ void AnimatedSprite3D::set_frame(int p_frame){
 
 	frame=p_frame;
 	_queue_update();
+	emit_signal(SceneStringNames::get_singleton()->frame_changed);
 
 }
 int AnimatedSprite3D::get_frame() const{
diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp
index 5b40a4d7e5..a82c69e67f 100644
--- a/scene/3d/visual_instance.cpp
+++ b/scene/3d/visual_instance.cpp
@@ -359,13 +359,13 @@ void GeometryInstance::_bind_methods() {
 GeometryInstance::GeometryInstance() {
 	draw_begin=0;
 	draw_end=0;
+	for(int i=0;i<FLAG_MAX;i++) {
+		flags[i]=false;
+	}
+
 	flags[FLAG_VISIBLE]=true;
 	flags[FLAG_CAST_SHADOW]=true;
 	flags[FLAG_RECEIVE_SHADOWS]=true;
-	flags[FLAG_BILLBOARD]=false;
-	flags[FLAG_BILLBOARD_FIX_Y]=false;
-	flags[FLAG_DEPH_SCALE]=false;
-	flags[FLAG_VISIBLE_IN_ALL_ROOMS]=false;
 	baked_light_instance=NULL;
 	baked_light_texture_id=0;
 	VS::get_singleton()->instance_geometry_set_baked_light_texture_index(get_instance(),0);
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index db9142cb99..b7b52a39dc 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -1693,6 +1693,13 @@ void Tree::text_editor_enter(String p_text) {
 		case TreeItem::CELL_MODE_RANGE: {
 
 			c.val=p_text.to_double();
+			if (c.step>0)
+				c.val=Math::stepify(c.val,c.step);
+			if (c.val<c.min)
+				c.val=c.min;
+			else if (c.val>c.max)
+				c.val=c.max;
+
 			//popup_edited_item->edited_signal.call( popup_edited_item_col );
 		} break;
 	default: { ERR_FAIL(); }
diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp
index 47089638bb..ed3e419359 100644
--- a/scene/main/scene_main_loop.cpp
+++ b/scene/main/scene_main_loop.cpp
@@ -333,6 +333,9 @@ void SceneTree::input_text( const String& p_text ) {
 void SceneTree::input_event( const InputEvent& p_event ) {
 
 
+	if (is_editor_hint() && (p_event.type==InputEvent::JOYSTICK_MOTION || p_event.type==InputEvent::JOYSTICK_BUTTON))
+		return; //avoid joy input on editor
+
 	root_lock++;
 	//last_id=p_event.ID;
 
diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp
index 2ae918f3f3..f718a09577 100644
--- a/scene/main/timer.cpp
+++ b/scene/main/timer.cpp
@@ -40,7 +40,8 @@ void Timer::_notification(int p_what) {
 #ifdef TOOLS_ENABLED
 				if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root() && (get_tree()->get_edited_scene_root()==this || get_tree()->get_edited_scene_root()->is_a_parent_of(this)))
 					break;
-#endif				start();
+#endif
+				start();
 			}
 		} break;
 		case NOTIFICATION_PROCESS: {
diff --git a/scene/scene_string_names.cpp b/scene/scene_string_names.cpp
index 8ad7e06c0f..0d66257eda 100644
--- a/scene/scene_string_names.cpp
+++ b/scene/scene_string_names.cpp
@@ -150,4 +150,6 @@ SceneStringNames::SceneStringNames() {
 	_pressed=StaticCString::create("_pressed");
 	_toggled=StaticCString::create("_toggled");
 
+	frame_changed=StaticCString::create("frame_changed");
+
 }
diff --git a/scene/scene_string_names.h b/scene/scene_string_names.h
index 512674f648..b0628c86b6 100644
--- a/scene/scene_string_names.h
+++ b/scene/scene_string_names.h
@@ -158,6 +158,7 @@ public:
 	StringName _mouse_enter;
 	StringName _mouse_exit;
 
+	StringName frame_changed;
 
 
 };
diff --git a/servers/physics/body_pair_sw.cpp b/servers/physics/body_pair_sw.cpp
index bca6a9fa72..2e66c9e27b 100644
--- a/servers/physics/body_pair_sw.cpp
+++ b/servers/physics/body_pair_sw.cpp
@@ -175,7 +175,7 @@ void BodyPairSW::validate_contacts() {
 bool BodyPairSW::setup(float p_step) {
 
 	//cannot collide
-	if (A->has_exception(B->get_self()) || B->has_exception(A->get_self()) || (A->get_mode()<=PhysicsServer::BODY_MODE_KINEMATIC && B->get_mode()<=PhysicsServer::BODY_MODE_KINEMATIC && A->get_max_contacts_reported()==0 && B->get_max_contacts_reported()==0)) {
+	if ((A->get_layer_mask()&B->get_layer_mask())==0 || A->has_exception(B->get_self()) || B->has_exception(A->get_self()) || (A->get_mode()<=PhysicsServer::BODY_MODE_KINEMATIC && B->get_mode()<=PhysicsServer::BODY_MODE_KINEMATIC && A->get_max_contacts_reported()==0 && B->get_max_contacts_reported()==0)) {
 		collided=false;
 		return false;
 	}
diff --git a/servers/physics/collision_solver_sw.cpp b/servers/physics/collision_solver_sw.cpp
index 56f2784145..86e3b679f2 100644
--- a/servers/physics/collision_solver_sw.cpp
+++ b/servers/physics/collision_solver_sw.cpp
@@ -275,6 +275,44 @@ void CollisionSolverSW::concave_distance_callback(void *p_userdata, ShapeSW *p_c
 }
 
 
+
+bool CollisionSolverSW::solve_distance_plane(const ShapeSW *p_shape_A,const Transform& p_transform_A,const ShapeSW *p_shape_B,const Transform& p_transform_B,Vector3& r_point_A,Vector3& r_point_B) {
+
+	const PlaneShapeSW *plane = static_cast<const PlaneShapeSW*>(p_shape_A);
+	if (p_shape_B->get_type()==PhysicsServer::SHAPE_PLANE)
+		return false;
+	Plane p = p_transform_A.xform(plane->get_plane());
+
+	static const int max_supports = 16;
+	Vector3 supports[max_supports];
+	int support_count;
+
+	p_shape_B->get_supports(p_transform_B.basis.xform_inv(-p.normal).normalized(),max_supports,supports,support_count);
+
+	bool collided=false;
+	Vector3 closest;
+	float closest_d;
+
+
+	for(int i=0;i<support_count;i++) {
+
+		supports[i] = p_transform_B.xform( supports[i] );
+		real_t d = p.distance_to(supports[i]);
+		if (i==0 || d<closest_d) {
+			closest=supports[i];
+			closest_d=d;
+			if (d<=0)
+				collided=true;
+		}
+
+	}
+
+	r_point_A=p.project(closest);
+	r_point_B=closest;
+
+	return collided;
+}
+
 bool CollisionSolverSW::solve_distance(const ShapeSW *p_shape_A,const Transform& p_transform_A,const ShapeSW *p_shape_B,const Transform& p_transform_B,Vector3& r_point_A,Vector3& r_point_B,const AABB& p_concave_hint,Vector3 *r_sep_axis) {
 
 	if (p_shape_A->is_concave())
@@ -282,7 +320,11 @@ bool CollisionSolverSW::solve_distance(const ShapeSW *p_shape_A,const Transform&
 
 	if (p_shape_B->get_type()==PhysicsServer::SHAPE_PLANE) {
 
-		return false; //unsupported
+		Vector3 a,b;
+		bool col = solve_distance_plane(p_shape_B,p_transform_B,p_shape_A,p_transform_A,a,b);
+		r_point_A=b;
+		r_point_B=a;
+		return !col;
 
 	} else if (p_shape_B->is_concave()) {
 
diff --git a/servers/physics/collision_solver_sw.h b/servers/physics/collision_solver_sw.h
index 430f057c7c..764c32926c 100644
--- a/servers/physics/collision_solver_sw.h
+++ b/servers/physics/collision_solver_sw.h
@@ -42,6 +42,7 @@ private:
 	static bool solve_ray(const ShapeSW *p_shape_A,const Transform& p_transform_A,const ShapeSW *p_shape_B,const Transform& p_transform_B,CallbackResult p_result_callback,void *p_userdata,bool p_swap_result);
 	static bool solve_concave(const ShapeSW *p_shape_A,const Transform& p_transform_A,const ShapeSW *p_shape_B,const Transform& p_transform_B,CallbackResult p_result_callback,void *p_userdata,bool p_swap_result,float p_margin_A=0,float p_margin_B=0);
 	static void concave_distance_callback(void *p_userdata, ShapeSW *p_convex);
+	static bool solve_distance_plane(const ShapeSW *p_shape_A,const Transform& p_transform_A,const ShapeSW *p_shape_B,const Transform& p_transform_B,Vector3& r_point_A,Vector3& r_point_B);
 
 public:
 
diff --git a/servers/visual/rasterizer.cpp b/servers/visual/rasterizer.cpp
index 5e81bc960a..b5e74e0f2e 100644
--- a/servers/visual/rasterizer.cpp
+++ b/servers/visual/rasterizer.cpp
@@ -79,7 +79,7 @@ RID Rasterizer::_create_shader(const FixedMaterialShaderKey& p_key) {
 	if (texcoords_used&(1<<VS::FIXED_MATERIAL_TEXCOORD_UV_TRANSFORM)) {
 
 		code+="uniform mat4 fmp_uv_xform;\n";
-		code+="vec2 uv_xform = fmp_uv_xform * UV;\n";
+		code+="vec2 uv_xform = (fmp_uv_xform * vec4(UV,0,1)).xy;\n";
 	}
 
 	/* HANDLE NORMAL MAPPING */
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp
index ca219b13a4..40e36d2a89 100644
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@@ -436,7 +436,10 @@ ShaderLanguage::Token ShaderLanguage::read_token(const CharType* p_text,int p_le
 				return Token(TK_INDENTIFIER,str);
 			}
 
-			return Token(TK_ERROR,"Unknown character");
+			if (GETCHAR(0)>32)
+				return Token(TK_ERROR,"Tokenizer: Unknown character #"+itos(GETCHAR(0))+": '"+String::chr(GETCHAR(0))+"'");
+			else
+				return Token(TK_ERROR,"Tokenizer: Unknown character #"+itos(GETCHAR(0)));
 
 		} break;
 	}
@@ -463,9 +466,9 @@ Error ShaderLanguage::tokenize(const String& p_text,Vector<Token> *p_tokens,Stri
 		if (t.type==TK_ERROR) {
 
 			if (r_error) {
-				return ERR_COMPILATION_FAILED;
 				*r_error=t.text;
 				*r_err_line=line;
+				return ERR_COMPILATION_FAILED;
 			}
 		}
 
@@ -952,10 +955,16 @@ const ShaderLanguage::OperatorDef ShaderLanguage::operator_defs[]={
 	{OP_ASSIGN_ADD,TYPE_VOID,{TYPE_VEC2,TYPE_VEC2}},
 	{OP_ASSIGN_ADD,TYPE_VOID,{TYPE_VEC3,TYPE_VEC3}},
 	{OP_ASSIGN_ADD,TYPE_VOID,{TYPE_VEC4,TYPE_VEC4}},
+	{OP_ASSIGN_ADD,TYPE_VOID,{TYPE_VEC2,TYPE_FLOAT}},
+	{OP_ASSIGN_ADD,TYPE_VOID,{TYPE_VEC3,TYPE_FLOAT}},
+	{OP_ASSIGN_ADD,TYPE_VOID,{TYPE_VEC4,TYPE_FLOAT}},
 	{OP_ASSIGN_SUB,TYPE_VOID,{TYPE_FLOAT,TYPE_FLOAT}},
 	{OP_ASSIGN_SUB,TYPE_VOID,{TYPE_VEC2,TYPE_VEC2}},
 	{OP_ASSIGN_SUB,TYPE_VOID,{TYPE_VEC3,TYPE_VEC3}},
 	{OP_ASSIGN_SUB,TYPE_VOID,{TYPE_VEC4,TYPE_VEC4}},
+	{OP_ASSIGN_SUB,TYPE_VOID,{TYPE_VEC2,TYPE_FLOAT}},
+	{OP_ASSIGN_SUB,TYPE_VOID,{TYPE_VEC3,TYPE_FLOAT}},
+	{OP_ASSIGN_SUB,TYPE_VOID,{TYPE_VEC4,TYPE_FLOAT}},
 	{OP_ASSIGN_MUL,TYPE_VOID,{TYPE_FLOAT,TYPE_FLOAT}},
 	{OP_ASSIGN_MUL,TYPE_VOID,{TYPE_VEC2,TYPE_VEC2}},
 	{OP_ASSIGN_MUL,TYPE_VOID,{TYPE_VEC2,TYPE_FLOAT}},
@@ -2485,6 +2494,9 @@ Error ShaderLanguage::compile(const String& p_code,ShaderType p_type,CompileFunc
 	uint64_t t = OS::get_singleton()->get_ticks_usec();
 
 	Error err = tokenize(p_code,&tokens,r_error,r_err_line,r_err_column);
+	if (err!=OK) {
+		print_line("tokenizer error!");
+	}
 
 	double tf = (OS::get_singleton()->get_ticks_usec()-t)/1000.0;
 	//print_line("tokenize time: "+rtos(tf));
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index 0d4f5a7b74..a47e878562 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -2513,6 +2513,7 @@ void AnimationKeyEditor::_query_insert(const InsertData& p_id) {
 
 
 	if (insert_frame!=OS::get_singleton()->get_frames_drawn()) {
+		//clear insert list for the frame if frame changed
 		if (insert_confirm->is_visible())
 			return; //do nothing
 		insert_data.clear();
@@ -2520,6 +2521,12 @@ void AnimationKeyEditor::_query_insert(const InsertData& p_id) {
 	}
 	insert_frame=OS::get_singleton()->get_frames_drawn();
 
+	for (List<InsertData>::Element *E=insert_data.front();E;E=E->next()) {
+		//prevent insertion of multiple tracks
+		if (E->get().path==p_id.path)
+			return; //already inserted a track for this on this frame
+	}
+
 	insert_data.push_back(p_id);
 
 	if (p_id.track_idx==-1) {
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 5e9cdf78a2..2927e7c870 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -2819,6 +2819,8 @@ void EditorNode::animation_editor_make_visible(bool p_visible) {
 		//pd_anim->hide();
 		animation_editor->hide();
 //		scene_root_parent->set_margin(MARGIN_TOP,0);
+		if (!animation_vb->get_parent_control())
+			return;
 		animation_vb->get_parent_control()->minimum_size_changed();
 		top_split->set_collapsed(true);
 	}
diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.cpp b/tools/editor/plugins/polygon_2d_editor_plugin.cpp
index 7dd8dd3035..27e539d50b 100644
--- a/tools/editor/plugins/polygon_2d_editor_plugin.cpp
+++ b/tools/editor/plugins/polygon_2d_editor_plugin.cpp
@@ -187,6 +187,8 @@ void Polygon2DEditor::_wip_close() {
 
 bool Polygon2DEditor::forward_input_event(const InputEvent& p_event) {
 
+	if (node==NULL)
+		return false;
 
 	switch(p_event.type) {
 
@@ -701,11 +703,16 @@ void Polygon2DEditor::edit(Node *p_collision_polygon) {
 		node=p_collision_polygon->cast_to<Polygon2D>();
 		if (!canvas_item_editor->get_viewport_control()->is_connected("draw",this,"_canvas_draw"))
 			canvas_item_editor->get_viewport_control()->connect("draw",this,"_canvas_draw");
+		node->connect("exit_tree",this,"_node_removed",varray(),CONNECT_ONESHOT);
 		wip.clear();
 		wip_active=false;
 		edited_point=-1;
 
 	} else {
+
+		if (node)
+			node->disconnect("exit_tree",this,"_node_removed");
+
 		node=NULL;
 
 		if (canvas_item_editor->get_viewport_control()->is_connected("draw",this,"_canvas_draw"))
@@ -723,12 +730,14 @@ void Polygon2DEditor::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_uv_draw"),&Polygon2DEditor::_uv_draw);
 	ObjectTypeDB::bind_method(_MD("_uv_input"),&Polygon2DEditor::_uv_input);
 	ObjectTypeDB::bind_method(_MD("_uv_scroll_changed"),&Polygon2DEditor::_uv_scroll_changed);
+	ObjectTypeDB::bind_method(_MD("_node_removed"),&Polygon2DEditor::_node_removed);
 
 
 }
 
 Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) {
 
+	node=NULL;
 	canvas_item_editor=NULL;
 	editor=p_editor;
 	undo_redo = editor->get_undo_redo();
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index c0d773309c..a5164d971b 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -1443,7 +1443,7 @@ void ScriptEditor::_add_callback(Object *p_obj, const String& p_function, const
 		int pos = script->get_language()->find_function(p_function,code);
 		if (pos==-1) {
 			//does not exist
-
+			ste->get_text_edit()->deselect();
 			pos=ste->get_text_edit()->get_line_count()+2;
 			String func = script->get_language()->make_function("",p_function,p_args);
 			//code=code+func;
diff --git a/tools/editor/plugins/shader_editor_plugin.cpp b/tools/editor/plugins/shader_editor_plugin.cpp
index d9bf4b6fa5..a6172ee098 100644
--- a/tools/editor/plugins/shader_editor_plugin.cpp
+++ b/tools/editor/plugins/shader_editor_plugin.cpp
@@ -144,10 +144,13 @@ void ShaderTextEditor::_validate_script() {
 	Error err = ShaderLanguage::compile(code,type,NULL,NULL,&errortxt,&line,&col);
 
 	if (err!=OK) {
-		String error_text="error("+itos(line)+","+itos(col)+"): "+errortxt;
+		String error_text="error("+itos(line+1)+","+itos(col)+"): "+errortxt;
 		set_error(error_text);
+		get_text_edit()->set_line_as_marked(line,true);
 
 	} else {
+		for(int i=0;i<get_text_edit()->get_line_count();i++)
+			get_text_edit()->set_line_as_marked(i,false);
 		set_error("");
 	}
 
diff --git a/tools/export/blender25/io_scene_dae/export_dae.py b/tools/export/blender25/io_scene_dae/export_dae.py
index 8b1d2e296a..c41b60f2e6 100644
--- a/tools/export/blender25/io_scene_dae/export_dae.py
+++ b/tools/export/blender25/io_scene_dae/export_dae.py
@@ -1438,11 +1438,16 @@ class DaeExporter:
 		return tcn
 
 	def export_animations(self):
-
+		tmp_mat = []												# workaround by ndee					
+		for s in self.skeletons:									# workaround by ndee
+			tmp_bone_mat = []										# workaround by ndee
+			for bone in s.pose.bones:								# workaround by ndee
+				tmp_bone_mat.append(Matrix(bone.matrix_basis))		# workaround by ndee
+			tmp_mat.append([Matrix(s.matrix_local),tmp_bone_mat])	# workaround by ndee -> stores skeleton and bone transformations
+			
 		self.writel(S_ANIM,0,'<library_animations>')
 
 
-
 		if (self.config["use_anim_action_all"] and len(self.skeletons)):
 
 			cached_actions = {}
@@ -1473,13 +1478,18 @@ class DaeExporter:
 								bones.append(dp)
 
 				allowed_skeletons=[]
-				for y in self.skeletons:
+				for i,y in enumerate(self.skeletons):				# workaround by ndee
 					if (y.animation_data):
 						for z in y.pose.bones:
 							if (z.bone.name in bones):
 								if (not y in allowed_skeletons):
 									allowed_skeletons.append(y)
 						y.animation_data.action=x;
+						
+						y.matrix_local = tmp_mat[i][0]				# workaround by ndee -> resets the skeleton transformation. 
+						for j,bone in enumerate(s.pose.bones):		# workaround by ndee
+							bone.matrix_basis = Matrix()			# workaround by ndee -> resets the bone transformations. Important if bones in follwing actions miss keyframes
+							
 
 				print("allowed skeletons "+str(allowed_skeletons))
 
@@ -1498,16 +1508,20 @@ class DaeExporter:
 
 			self.writel(S_ANIM_CLIPS,0,'</library_animation_clips>')
 
-			for s in self.skeletons:
+			for i,s in enumerate(self.skeletons):					# workaround by ndee
 				if (s.animation_data==None):
 					continue
 				if s in cached_actions:
 					s.animation_data.action = bpy.data.actions[cached_actions[s]]
 				else:
 					s.animation_data.action = None
+					for j,bone in enumerate(s.pose.bones):			# workaround by ndee
+						bone.matrix_basis = tmp_mat[i][1][j]		# workaround by ndee  -> resets the bone transformation to what they were before exporting.
 		else:
 			self.export_animation(self.scene.frame_start,self.scene.frame_end)
-
+		
+			
+		
 		self.writel(S_ANIM,0,'</library_animations>')
 
 	def export(self):

From efb257c675a028de666b4bfcbac47b16770e10e7 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Sun, 7 Dec 2014 02:31:43 -0300
Subject: [PATCH 04/14] missing fix in file

---
 scene/2d/area_2d.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp
index 68dcfcb875..ca2a42026d 100644
--- a/scene/2d/area_2d.cpp
+++ b/scene/2d/area_2d.cpp
@@ -350,7 +350,7 @@ Area2D::Area2D() : CollisionObject2D(Physics2DServer::get_singleton()->area_crea
 	set_gravity_vector(Vector2(0,1));
 	gravity_is_point=false;
 	density=0.1;
-	locked=true;
+	locked=false;
 	priority=0;
 	monitoring=false;
 	set_enable_monitoring(true);

From c940212b8931c0cc9c24984758568c2d2d18b951 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Sun, 7 Dec 2014 02:39:51 -0300
Subject: [PATCH 05/14] more bugfixes

---
 modules/gdscript/gd_script.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index b19168f536..982584c75c 100644
--- a/modules/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
@@ -2034,7 +2034,9 @@ Error GDScript::load_source_code(const String& p_path) {
 	}
 
 	source=s;
+#ifdef TOOLS_ENABLED
 	source_changed_cache=true;
+#endif
 	//print_line("LSC :"+get_path());
 	path=p_path;
 	return OK;

From 05801b92652f3fc21063a8aab516633769c9ba55 Mon Sep 17 00:00:00 2001
From: Dana Olson <dana@shineuponthee.com>
Date: Sun, 7 Dec 2014 01:07:00 -0500
Subject: [PATCH 06/14] apply patch #882 from dcubix

---
 scene/gui/text_edit.cpp                       |  10 +-
 tools/editor/plugins/script_editor_plugin.cpp | 124 ++++++++++++++----
 tools/editor/plugins/script_editor_plugin.h   |   2 +-
 3 files changed, 106 insertions(+), 30 deletions(-)

diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index b95d271394..3f0dc22ab6 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -3150,12 +3150,18 @@ void TextEdit::set_line(int line, String new_text)
 {
     if (line < 0 || line > text.size())
         return;
-    text.set(line, new_text);
+    text.remove(line); // TODO: Make this Undo/Redoable....
+    insert_at(new_text, line);
+    //text.set(line, new_text);
 }
 
 void TextEdit::insert_at(const String &p_text, int at)
 {
-    text.insert(at, p_text);
+    cursor_set_column(0);
+    cursor_set_line(at);
+    _insert_text(at, 0, p_text+"\n");
+    //_insert_text_at_cursor(p_text);
+    //old: text.insert(at, p_text);
 }
 
 void TextEdit::set_show_line_numbers(bool p_show) {
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index a5164d971b..c5fb574c71 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -608,6 +608,16 @@ bool ScriptEditor::_test_script_times_on_disk() {
 	return all_ok;
 }
 
+void ScriptEditor::swap_lines(TextEdit *tx, int line1, int line2)
+{
+    String tmp = tx->get_line(line1);
+    String tmp2 = tx->get_line(line2);
+    tx->set_line(line2, tmp);
+    tx->set_line(line1, tmp2);
+
+    tx->cursor_set_line(line2);
+}
+
 void ScriptEditor::_menu_option(int p_option) {
 
 
@@ -690,18 +700,38 @@ void ScriptEditor::_menu_option(int p_option) {
             if (scr.is_null())
                 return;
 
-            int line_id = tx->cursor_get_line();
-            int next_id = line_id - 1;
+            if (tx->is_selection_active())
+            {
+                int from_line = tx->get_selection_from_line();
+                int from_col  = tx->get_selection_from_column();
+                int to_line   = tx->get_selection_to_line();
+                int to_column = tx->get_selection_to_column();
 
-            if (line_id == 0 || next_id < 0)
-                return;
+                for (int i = from_line; i <= to_line; i++)
+                {
+                    int line_id = i;
+                    int next_id = i - 1;
 
-            String tmp = tx->get_line(line_id);
-            String tmp2 = tx->get_line(next_id);
-            tx->set_line(next_id, tmp);
-            tx->set_line(line_id, tmp2);
+                    if (line_id == 0 || next_id < 0)
+                        return;
+
+                    swap_lines(tx, line_id, next_id);
+                }
+                int from_line_up = from_line > 0 ? from_line-1 : from_line;
+                int to_line_up   = to_line   > 0 ? to_line-1   : to_line;
+                tx->select(from_line_up, from_col, to_line_up, to_column);
+            }
+            else
+            {
+                int line_id = tx->cursor_get_line();
+                int next_id = line_id - 1;
+
+                if (line_id == 0 || next_id < 0)
+                    return;
+
+                swap_lines(tx, line_id, next_id);
+            }
             tx->update();
-            tx->cursor_set_line(next_id);
 
         } break;
         case EDIT_MOVE_LINE_DOWN: {
@@ -711,18 +741,38 @@ void ScriptEditor::_menu_option(int p_option) {
             if (scr.is_null())
                 return;
 
-            int line_id = tx->cursor_get_line();
-            int next_id = line_id + 1;
+            if (tx->is_selection_active())
+            {
+                int from_line = tx->get_selection_from_line();
+                int from_col  = tx->get_selection_from_column();
+                int to_line   = tx->get_selection_to_line();
+                int to_column = tx->get_selection_to_column();
 
-            if (line_id == tx->get_line_count() || next_id > tx->get_line_count())
-                return;
+                for (int i = to_line; i >= from_line; i--)
+                {
+                    int line_id = i;
+                    int next_id = i + 1;
 
-            String tmp = tx->get_line(line_id);
-            String tmp2 = tx->get_line(next_id);
-            tx->set_line(next_id, tmp);
-            tx->set_line(line_id, tmp2);
+                    if (line_id == tx->get_line_count()-1 || next_id > tx->get_line_count())
+                        return;
+
+                    swap_lines(tx, line_id, next_id);
+                }
+                int from_line_down = from_line < tx->get_line_count() ? from_line+1 : from_line;
+                int to_line_down   = to_line   < tx->get_line_count() ? to_line+1   : to_line;
+                tx->select(from_line_down, from_col, to_line_down, to_column);
+            }
+            else
+            {
+                int line_id = tx->cursor_get_line();
+                int next_id = line_id + 1;
+
+                if (line_id == tx->get_line_count()-1 || next_id > tx->get_line_count())
+                    return;
+
+                swap_lines(tx, line_id, next_id);
+            }
             tx->update();
-            tx->cursor_set_line(next_id);
 
         } break;
         case EDIT_INDENT_LEFT: {
@@ -740,19 +790,39 @@ void ScriptEditor::_menu_option(int p_option) {
                 for (int i = begin; i <= end; i++)
                 {
                     String line_text = tx->get_line(i);
-                    line_text = line_text.substr(1, line_text.length());
-                    tx->set_line(i, line_text);
+                    // begins with tab
+                    if (line_text.begins_with("\t"))
+                    {
+                        line_text = line_text.substr(1, line_text.length());
+                        tx->set_line(i, line_text);
+                    }
+                    // begins with 4 spaces
+                    else if (line_text.begins_with("    "))
+                    {
+                        line_text = line_text.substr(4, line_text.length());
+                        tx->set_line(i, line_text);
+                    }
                 }
             }
             else
             {
                 begin = tx->cursor_get_line();
                 String line_text = tx->get_line(begin);
-                line_text = line_text.substr(1, line_text.length());
-                tx->set_line(begin, line_text);
+                // begins with tab
+                if (line_text.begins_with("\t"))
+                {
+                    line_text = line_text.substr(1, line_text.length());
+                    tx->set_line(begin, line_text);
+                }
+                // begins with 4 spaces
+                else if (line_text.begins_with("    "))
+                {
+                    line_text = line_text.substr(4, line_text.length());
+                    tx->set_line(begin, line_text);
+                }
             }
             tx->update();
-            tx->deselect();
+            //tx->deselect();
 
         } break;
         case EDIT_INDENT_RIGHT: {
@@ -782,7 +852,7 @@ void ScriptEditor::_menu_option(int p_option) {
                 tx->set_line(begin, line_text);
             }
             tx->update();
-            tx->deselect();
+            //tx->deselect();
 
         } break;
         case EDIT_CLONE_DOWN: {
@@ -837,7 +907,7 @@ void ScriptEditor::_menu_option(int p_option) {
                 tx->set_line(begin, line_text);
             }
             tx->update();
-            tx->deselect();
+            //tx->deselect();
 
         } break;
 		case EDIT_COMPLETE: {
@@ -1498,8 +1568,8 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 	edit_menu->get_popup()->add_separator();
 	edit_menu->get_popup()->add_item("Select All",EDIT_SELECT_ALL,KEY_MASK_CMD|KEY_A);
     edit_menu->get_popup()->add_separator();
-    edit_menu->get_popup()->add_item("Move Line Up",EDIT_MOVE_LINE_UP,KEY_MASK_ALT|KEY_UP);
-    edit_menu->get_popup()->add_item("Move Line Down",EDIT_MOVE_LINE_DOWN,KEY_MASK_ALT|KEY_DOWN);
+    edit_menu->get_popup()->add_item("Move Up",EDIT_MOVE_LINE_UP,KEY_MASK_ALT|KEY_UP);
+    edit_menu->get_popup()->add_item("Move Down",EDIT_MOVE_LINE_DOWN,KEY_MASK_ALT|KEY_DOWN);
     edit_menu->get_popup()->add_item("Indent Left",EDIT_INDENT_LEFT,KEY_MASK_ALT|KEY_LEFT);
     edit_menu->get_popup()->add_item("Indent Right",EDIT_INDENT_RIGHT,KEY_MASK_ALT|KEY_RIGHT);
     edit_menu->get_popup()->add_item("Toggle Comment",EDIT_TOGGLE_COMMENT,KEY_MASK_CMD|KEY_SLASH);
diff --git a/tools/editor/plugins/script_editor_plugin.h b/tools/editor/plugins/script_editor_plugin.h
index 62508253e3..01942fab2a 100644
--- a/tools/editor/plugins/script_editor_plugin.h
+++ b/tools/editor/plugins/script_editor_plugin.h
@@ -218,7 +218,7 @@ public:
 
 	void get_breakpoints(List<String> *p_breakpoints);
 
-
+    void swap_lines(TextEdit *tx, int line1, int line2);
 
 	void save_external_data();
 

From 380f12def25e4031756354907e8d5abe5466b864 Mon Sep 17 00:00:00 2001
From: Dana Olson <dana@shineuponthee.com>
Date: Sun, 7 Dec 2014 02:21:49 -0500
Subject: [PATCH 07/14] now undo/redo supported

---
 scene/gui/text_edit.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 3f0dc22ab6..f1100c7c20 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -3150,18 +3150,15 @@ void TextEdit::set_line(int line, String new_text)
 {
     if (line < 0 || line > text.size())
         return;
-    text.remove(line); // TODO: Make this Undo/Redoable....
-    insert_at(new_text, line);
-    //text.set(line, new_text);
+    _remove_text(line, 0, line, text[line].length());
+    _insert_text(line, 0, new_text);
 }
 
 void TextEdit::insert_at(const String &p_text, int at)
 {
-    cursor_set_column(0);
-    cursor_set_line(at);
-    _insert_text(at, 0, p_text+"\n");
-    //_insert_text_at_cursor(p_text);
-    //old: text.insert(at, p_text);
+	cursor_set_column(0);
+	cursor_set_line(at);
+	_insert_text(at, 0, p_text+"\n");
 }
 
 void TextEdit::set_show_line_numbers(bool p_show) {

From 10b371516bfd88f354acde9a2b37cf854eb92780 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Sun, 7 Dec 2014 11:33:57 -0300
Subject: [PATCH 08/14] More Fixes -=-=-=-=-=

-Bug in saving multinline text in xml fixed. #925
-typo in android export fixed. #930
---
 core/io/resource_format_xml.cpp    |  6 +++++-
 platform/android/export/export.cpp |  2 +-
 scene/gui/text_edit.cpp            | 12 ++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/io/resource_format_xml.cpp b/core/io/resource_format_xml.cpp
index 2a79e6647d..75384d4ab6 100644
--- a/core/io/resource_format_xml.cpp
+++ b/core/io/resource_format_xml.cpp
@@ -193,6 +193,7 @@ Error ResourceInteractiveLoaderXML::close_tag(const String& p_name) {
 
 void ResourceInteractiveLoaderXML::unquote(String& p_str) {
 
+
 	p_str=p_str.strip_edges().replace("\"","").xml_unescape();
 
 	/*p_str=p_str.strip_edges();
@@ -1851,7 +1852,10 @@ void ResourceFormatSaverXMLInstance::escape(String& p_str) {
 	for (int i=1;i<32;i++) {
 
 		char chr[2]={i,0};
-		p_str=p_str.replace(chr,"&#"+String::num(i)+";");
+		const char hexn[16]={'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};
+		const char hex[8]={'&','#','0','0',hexn[i>>4],hexn[i&0xf],';',0};
+
+		p_str=p_str.replace(chr,hex);
 	}
 
 
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 89f121c3f6..3e4ea8a4e0 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -1229,7 +1229,7 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d
 		}
 
 		if (!FileAccess::exists(keystore)) {
-			EditorNode::add_io_error("Could not find keytore, unable to export.");
+			EditorNode::add_io_error("Could not find keystore, unable to export.");
 			return ERR_FILE_CANT_OPEN;
 		}
 
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index f1100c7c20..ba68948e6b 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -1747,16 +1747,16 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
                 }
                 break;}
 
-                default: {
+		default: {
 
-                    scancode_handled=false;
-                } break;
+		    scancode_handled=false;
+		} break;
 
             }
 
             if (scancode_handled)
                 accept_event();
-
+/*
             if (!scancode_handled && !k.mod.command && !k.mod.alt) {
 
                 if (k.unicode>=32) {
@@ -1770,8 +1770,8 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
                     break;
                 }
             }
-
-            if (!scancode_handled && !k.mod.command && !k.mod.alt) {
+*/
+	    if (!scancode_handled && !k.mod.command && !k.mod.alt) { //for german kbds
 
                 if (k.unicode>=32) {
 

From 45c9e169d9a6fcf1630bf6fb23cb606f0bba5fb5 Mon Sep 17 00:00:00 2001
From: marynate <mary.w.nate@gmail.com>
Date: Mon, 8 Dec 2014 13:20:14 +0800
Subject: [PATCH 09/14] Add missing icon.png to tween demo

---
 demos/misc/tween/icon.png | Bin 0 -> 3621 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 demos/misc/tween/icon.png

diff --git a/demos/misc/tween/icon.png b/demos/misc/tween/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e991fcc291bf1ab2860b60b083f48a3bc536da7
GIT binary patch
literal 3621
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$I14-?iy0V{<3X75-2t<u
z3=9nHC7!;n?DrTYg$)(N58dHpU|^6eag8W(&d<$F%`0JWE=o--Nlj5G&n(GMaQE~L
z2yf&QXJFu+@9E+gQgQ3)?C4_Y@S@}O#c6C3cNm3OIK7lygBEF?o+fg8_TDMmwL)*6
zn!WlH@1}T#l{GB(%RbGhX?&A@;_$v@TAJyPr-qoRdQEZZ{Lbw$fu(T%>yyk4f(|hp
z6SgE-$FhbcT39UqUBByh$@iCwFSN_))P5^J5PsnK0TY1-%iX092tT+#J$(MZh1a>g
z<PYv=%M<Tf{zpbb(tqoLAHQq_PFX(u&-&wcws1_K!zpb(#R)-7pLR9;xc>C&^8XjA
zmi<dOWX{NO{P@fh=K|M?Oq^$Z=X{G-SsJHEV`|ts*NTQ+k;ggO>MUoT>wEs`cl{UB
z1uMV(FOxm=+O4HR>u`k8*$|U=_Vu+JeDi*P4M<+1mi{y4S>OM^8-gA^c{5}4Wal+e
zFL#+d{C;}1|Nje233~%<_SS|Te1GTX6qgGQ;#ud*|Ghq0uduXyVdS50;`P1is!lIU
z0=K;m+NOK$-r9imb7DnXdY@ihUYu3@wLaeb_4Ml{3qQ?vj~5Cs4RLj3>bmqa{^BA|
zzt6v!kMG+0p<#z0)0B0FBCI^VkJFy9?RMYotDv7Q=VmZvj!(Kd%ZIC>q5D&BI|T}K
zy@;}8IR1G?-|`E+AF4BN*>x#hU}C%Ja!UTSjp;G5Ud#0_VrCoFtIqoU=c>(LfhC=6
zkAp9B^Cq@*2}FHf+_Y$dhre)$Y5a+UE8@G8|HNdoS<3h1Ej#9E|4Y|#;iA>N@rl)X
zrPo!Lta9#sSP{qEy!t)g<y%vg_o(rQ9#>oQ(mA8a>&u+US6XjfFZ`x-xp;jJlP_1t
z>i&xfOOj^F`*gqBc6Y{iDFcD<t@%qc*XIT6+Ov3SPMp`SG)4ROibjSNuLQJY4Sqbi
zeBVH{_i=20RGi1lf|hpv{Vx1%`ZeKu59nMyS@P|5oS}o3@!{p&`~f{0OE=dzKRvf_
z=FY7rntxWee04Z~;Ay*(|EV;a0^w+LjrmV+S5%*OE-UL?dfWR(R)g2aCE+>^*Rq=m
zl+LPeF8{bBMbGwROx2|H+3PiB@_uKPmcJ}EnpkmLZf%W$aK_oEo+tmfOxqaIC9Ykc
z^^R-OkBVvj&)@xgUpHm$!YIukyR)UyCz_X@PpMW|BAr<G_2v4Fw&JlXDuNz)cB--b
z%xXP5*YsJsn5X1I{#~z{w>WBWrQUvY^_O>^-+4pH-p3Vj#s<L!HvGOE|NcBGbmy4c
zv-}oA#<F$%@^zjz0(%M$$v1!aTk-n){#~y>+}&*d&}tfgLq`9aG%-0Ik$uyp{)KpG
za3%Vtr~RvYAFE(CEwwC%$-l}z@}T~svy&&y?lhb<GkPuqM`-fDYfizfEcW49Kbx1%
z=I(g*O@qPa`q82{*{k>bxv}!y&Wd%H^Oz=?=T8&t`XJmpUwLcU=I8oyzi%#C|GqCY
zIrX>hECG3)MZfnOG+y27E3^8Vwn&(T<&A{(5kF2={zwddaXD)0;=5bxb~+?qHNR)O
z_?d<HJGQwGLvBBJzR*#;^-=Tm_48up@a)`n^xa8Cr=2%ML|ARkAKsXobNbN6T$}Tc
z*#j4(eLeFv=FPR5b(dFgYlyG@SM`tK`nFw@ch2kJ4c;FvWo10ibE1s*0(R4!%L@yN
zj=lVN^DDE0qaatXxzUlyh9RK|S9L$Nt54~^%EnO?z;!oz@z&Fo!Tla8XU-hr-LlPS
z+PcgZWwx0)v(}dH4)F?Y(OS1{x7GtIy~i^}%+r=xX?yN+QxRJhXMD3}cXRUY#n#6r
z{tP@|&~!%s+>b-Iw;jIrOK$f2vX!B}Ccde8g>3~YE#?`~xvRb^h<=Od|9EDG{-4N&
zM~>a%tG;b1AFeEtlKAr5?~iT@xmT`kkZu3jpZ3>1`gQf5ik~u}xjbJ#J>}vqF5mh2
zqs+}{$!qcX-`Bo+v8!)c_Kjt&ud8aijI@Hy)e2(!-^<%Se__!c5ISMf)TyF&{~sA2
zyX0x&oBHdTO7!d98MDl`T<cxJcxiHr6Pw$Li3W4!=6`&2)VM_V!Sy$#wg+y1z5XWu
z`HCs4R;+r#xkQj_Lq&aGYkykAk00CWT`q)f<#{znX6~n|r?T$HElqs$&!~p92-y7l
zoUC)%&C4^(rg2%8^2|FK3?7~;-}do*P5Y|5>)u>jHYT?9@uue(MHP2#H{hHYam4=T
zMblmfgA0@ML$hbxeD=+Hi`-LP#gJ?FbABgFE_~n-{Ud`x;jfa0!_KHzl`L!tH`6Ys
zYt+_s8hxn#U3~oI{;gVFPFsU^7R<?JbO;p5y88X=VHcB|mrr_X8a63LbzYmQWO3Z_
zvP-<b=28{0{-5{H?y?MWvle1-;yAT*lm3@Sds$_!zpFaG&DSpK7svIF>tgh_uXVd-
zW?#*IeB-Vb_LFxW@i1KV;=R1dtxL%LHk)e3tYgn^-*ppIm3*o%SKId5s<;1nlC_w(
z_xG7|{DQTneY~@p@xcwgsX@KFzdzq$S}T3ptk72c_}0MCsque*P2acpZq@egb+45z
z4_;(e<a`>`+I&}8ZTV#%zvVw?zq~*3{M-kgo@rS!4S(l4zcLk8To;xg=oFwe&C=HH
z@niSyJAYH=O+L)jxWF&V=3-Bb?Y4VwO}AYVY}R|b$w&6x^OaMwmmGWSk|cOc{dj@w
z^vN}ilNU2x&EgFW-7PtZw>a;+D#NtY@4acQS~u?9c>HFIi`LwPq%0ZN#;UVRV%8K)
z(oeXy*1NG*lVL(H!_v65o8#A(---!l3SIFxeDO-x*ZJEzj~x>6>uUCOH9NL?%Bm2r
ztMfj`hFz{=O1PGNMW%hiveK!uq9qso_pv<QZxoa2%i*{+W^ss)xk>7jH5+2TZTq>a
z;`I&RHwPIweAQ>oSWvOY{b9!J<?6p(CQHhlyZ^dU?17nj@DtV5M-OLs&A)%LxclOR
z?sad^f3#7Vq<((?(T%URa2@D99J*bYL3z@HhktBm>_7g@b6)e`a*_V;3wRk8YOIlc
zr?^x_(p!LAVuh3BublcRLAMPWs)CX#^|rkZ+Umn~G&rc!aKE*$a8u0AmfWz;USC67
zQ)e}y$1i86YPBx*WBBrnak;wc=HyJD)o$yeUd=f3#iqzQ|3gfB^R@R)i6zQD3Ia+Z
zorTpkm)Kt$In7=FXwLFQshjHOERNGojxJpjb=3YP<BHI3pS!gewq^7_@7~-kakfQQ
zfFsZ{pK0CWA6fTqMOCfqS(WG_q;p1ZqP6Xk2#ZB=dI6KwMfz-XHXl1~{(N^`_=@Y1
z_ak3R|JznxlM&TWZCt*qrawSr-rAb(=MfrCu7XVkIXx9gb4qNEe)?p7*ZtR7!<_4?
z3RjNZbdXN4W0)5CI&;a-tkx2XOFgre*k@ca@JLHnuztLM`>#j0_i68{-{b$&r2WE|
zwg<V})@=FvF^2u+&N*qzW^%Y!TQvsg9Q|v}&yjh{LD<N4`sPcK!Vk>U<8{9?EC_p5
zpmoqed0PF>Pxc(X%JXKaOrG~{=H{xPq!*2ishSr<_Agzk@4?bL&(?0&s$a58YbQ%-
z3OXsTSXFyAWq--Bd-trqo|;+DAavp0Z_U+l-=4l`D6p+RaLDD_dv1wt)f@Kb0<BI5
zTijY&u;ucPz;G^|+V6L^=Puovec=QDy#<qki%*m>?q;28E2QH2v7-OcN4ZsU3L@SU
zeNuOrnmx3B_4Q98yM5H}Bfq29N6a|!YoCIkiHFbmN2%!=x7Av`W*)vH_W0%Oy_Mmi
zUCZ6~gqiXv`<O_mWwQKba`WC-=eLP9Ap2;`qJZMqQ(v{7R`Fh5qr|QfzHy^wi-3>c
z9fhoxjxAUD_oO{4nR5FLhuoHLqLVJAmgY}h`ts(wgNv&gGK%KR4B4fAdsV<iX2qP%
zZh6mr!<83HEV{p9Z`JQNKetyrH#$4*F}K9Sb({98tM-e%`|TPXu<OzEwU?96WEB>u
zRBYMprZ!bEQ$qH4efEL4i_-!`oK~HRzxSV2^!T#8+cUPcX3m@uCc8QAsL|>jeZCe3
zJ9G`@dM96JW^oE^a%)L2a4`^2lDNQ`#mM9PeeV5AxqF}0cF81NG`bn{dtdd-bK6gB
zdC`6TU)GCrX9JlQBr?zOcAZ{(qC{3szy5MTNA8}IvW}7;iU%jZ|2KJa+V>kC$5U!s
zr#rhgz2E9nmT@Qbx$aFd|M~UZ&u`fN?sm1eo-*(Br_K2{tj?OheOsik#m7VAQ2va4
zFKT@`_P_pP6!qYwTl1B=mpxC@|KBZ?y2H(oeIa3X_WjQ_)x4W$uKPEm|6KH*oAaJr
zJ!qD_x?g{lXOz?i_B(Q0%IC}Fe7ft|cjk)?w{WEW<y~*MVz*yddyIXd#u|C~q7A#-
z9=mU27SHitT)6(-x7MwetIyp##{F%3T;cC?%*!6Hly{YP>~3!^nz%iGU-pe(AHKNE
z^+|VjGx)OIIezBE0E>I+-wWDTP1(`qwPo$rbr+K^zq%>2*YAG*R8^txF)wDXpLX+{
z{DyCNtu=Ys2@^`@%@SY!@28ZWucqwILn$WLmd^WYvUKm$t@T%zTt3sMm0EQCw}?Mq
z!S9N1ii|fR;%cp~bG7XAI~F{BkD2<!b>0s%+7DgiTi=+V;%8##r!z}Igk#Zasa>lU
zX)$em`Lvq(VWM~EYtNkP2g_n#ZS!1N<F>QHX>ZJn8>`kU*qG!U-*;ZEZbJ9u+%sHj
z3++8J<+9B5yfoiuGX_2K<bS!VV%}w+?)CeV-~M@fQU2Sjoc*iRY=w6w?)kQri$6C!
zow4ZWUwgl0o2A_hzMSA_n-sp&`$zJk6q{B-o?M3iJNEqgGQUd4-TZI;PP_m6U;4EE
UYnC|(>f$kYy85}Sb4q9e05`M)-T(jq

literal 0
HcmV?d00001


From 88f58c5c26b0dfb759400f20e104a86af3187cb1 Mon Sep 17 00:00:00 2001
From: marynate <mary.w.nate@gmail.com>
Date: Sat, 6 Dec 2014 20:59:16 +0800
Subject: [PATCH 10/14] Update ios simulator build config file to build under
 new ios SDK

---
 platform/isim/detect.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/platform/isim/detect.py b/platform/isim/detect.py
index f4a17838f9..8d60e30d25 100644
--- a/platform/isim/detect.py
+++ b/platform/isim/detect.py
@@ -60,14 +60,18 @@ def configure(env):
 							'-Xlinker',
 							'-objc_abi_version',
 							'-Xlinker', '2',
-							'-framework', 'Foundation',
-							'-framework', 'UIKit',
-							'-framework', 'IOKit',
+							'-framework', 'AudioToolbox',
+							'-framework', 'AVFoundation',
+							'-framework', 'CoreAudio',
 							'-framework', 'CoreGraphics',
+							'-framework', 'CoreMedia',
+							'-framework', 'Foundation',
+							'-framework', 'Security',
+							'-framework', 'UIKit',
+							'-framework', 'MediaPlayer',
 							'-framework', 'OpenGLES',
 							'-framework', 'QuartzCore',
-							'-framework', 'AudioToolbox',
-							'-framework', 'MediaPlayer',
+							'-framework', 'SystemConfiguration',
 							'-F$ISIMSDK',
 							])
 

From dc694f49b8e9a98052be38fa2a5a33cba42e668e Mon Sep 17 00:00:00 2001
From: Dana Olson <dana@shineuponthee.com>
Date: Mon, 8 Dec 2014 04:35:06 -0500
Subject: [PATCH 11/14] remove old unused pref, added new confirm insert track

---
 tools/editor/animation_editor.cpp | 26 ++++++++++++++------------
 tools/editor/editor_settings.cpp  |  1 +
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index a47e878562..95f9ee6509 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -2530,16 +2530,20 @@ void AnimationKeyEditor::_query_insert(const InsertData& p_id) {
 	insert_data.push_back(p_id);
 
 	if (p_id.track_idx==-1) {
-		//potential new key, does not exist		
-		if (insert_data.size()==1)
-			insert_confirm->set_text("Create NEW track for "+p_id.query+" and insert key?");
-		else
-			insert_confirm->set_text("Create "+itos(insert_data.size())+" NEW tracks and insert keys?");
-
-		insert_confirm->get_ok()->set_text("Create");
-		insert_confirm->popup_centered(Size2(300,100));
-		insert_query=true;
+		if (bool(EDITOR_DEF("animation/confirm_insert_track",true))) {
+			//potential new key, does not exist		
+			if (insert_data.size()==1)
+				insert_confirm->set_text("Create NEW track for "+p_id.query+" and insert key?");
+			else
+				insert_confirm->set_text("Create "+itos(insert_data.size())+" NEW tracks and insert keys?");
 
+			insert_confirm->get_ok()->set_text("Create");
+			insert_confirm->popup_centered(Size2(300,100));
+			insert_query=true;
+		} else {
+			call_deferred("_insert_delay");
+			insert_queue=true;
+		}
 
 	} else {
 		if (!insert_query && !insert_queue) {
@@ -3150,7 +3154,7 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
 	//add_child(menu);
 
 	menu_track = memnew( MenuButton );
-	menu_track->set_text("Tracks..");
+	menu_track->set_text("Tracks");
 	hb->add_child(menu_track);
 	menu_track->get_popup()->connect("item_pressed",this,"_menu_track");
 
@@ -3348,8 +3352,6 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
 	add_child(insert_confirm);
 	insert_confirm->connect("confirmed",this,"_confirm_insert_list");
 
-	EDITOR_DEF("animation_editor/confirm_insert_key",true);
-
 	click.click=ClickOver::CLICK_NONE;
 
 
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 8852293fe4..8b4d899437 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -440,6 +440,7 @@ void EditorSettings::_load_defaults() {
 
 
 	set("animation/autorename_animation_tracks",true);
+	set("animation/confirm_insert_track",true);
 
 	set("property_editor/texture_preview_width",48);
 	set("help/doc_path","");

From 6851f9bfaefdd70eb009efdede444d3238c7277c Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Mon, 8 Dec 2014 15:47:45 -0300
Subject: [PATCH 12/14] Small Fixes -=-=-=-=-=-

-Bug in navmesh demo fixed
-Bug in variant
-Better Collada Exporter supports proper names of exported shapekeys
---
 core/variant.h                                |   2 +-
 demos/3d/navmesh/navmesh.gd                   |   2 +-
 modules/gdscript/gd_editor.cpp                | 300 ++++++++++++++++--
 scene/3d/camera.cpp                           |   2 +
 .../blender25/io_scene_dae/export_dae.py      |  11 +-
 5 files changed, 290 insertions(+), 27 deletions(-)

diff --git a/core/variant.h b/core/variant.h
index f651e38352..9109f4ad08 100644
--- a/core/variant.h
+++ b/core/variant.h
@@ -358,7 +358,7 @@ public:
 
 	static String get_operator_name(Operator p_op);
 	static void evaluate(const Operator& p_op,const Variant& p_a, const Variant& p_b,Variant &r_ret,bool &r_valid);
-	static _FORCE_INLINE_ Variant evaluate(Operator& p_op,const Variant& p_a, const Variant& p_b) {
+	static _FORCE_INLINE_ Variant evaluate(const Operator& p_op,const Variant& p_a, const Variant& p_b) {
 
 		bool valid=true;
 		Variant res;
diff --git a/demos/3d/navmesh/navmesh.gd b/demos/3d/navmesh/navmesh.gd
index a81a5e90d6..b5dc488ec3 100644
--- a/demos/3d/navmesh/navmesh.gd
+++ b/demos/3d/navmesh/navmesh.gd
@@ -76,7 +76,7 @@ func _input(ev):
 
 	if (ev.type==InputEvent.MOUSE_BUTTON and ev.button_index==BUTTON_LEFT and ev.pressed):
                 
-		var from = get_node("cambase/Camera").project_position(ev.pos)
+		var from = get_node("cambase/Camera").project_ray_origin(ev.pos)
 		var to = from+get_node("cambase/Camera").project_ray_normal(ev.pos)*100
 		var p = get_closest_point_to_segment(from,to)
 	
diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp
index 95bae2d32a..74d8259063 100644
--- a/modules/gdscript/gd_editor.cpp
+++ b/modules/gdscript/gd_editor.cpp
@@ -421,8 +421,235 @@ static bool _parse_completion_variant(const Variant& p_var,List<String>* r_optio
 
 }
 
+struct GDCompletionIdentifier {
 
-static void _parse_expression_node(const GDParser::Node *p_node,List<String>* r_options,List<String>::Element *p_indices) {
+	StringName obj_type;
+	Variant::Type type;
+};
+
+
+static GDCompletionIdentifier _guess_identifier_type(const GDParser::ClassNode *p_class,int p_line,const StringName& p_identifier);
+
+
+static bool _guess_identifier_type_in_expression(const GDParser::ClassNode *p_class,const GDParser::Node *p_node,int p_line,GDCompletionIdentifier &r_type) {
+
+
+	if (p_node->type==GDParser::Node::TYPE_CONSTANT) {
+
+		const GDParser::ConstantNode *cn=static_cast<const GDParser::ConstantNode *>(p_node);
+
+		r_type.type=cn->value.get_type();
+		if (r_type.type==Variant::OBJECT) {
+			Object *obj = cn->value;
+			if (obj) {
+				r_type.obj_type=obj->get_type();
+			}
+		}
+
+		return true;
+	} else if (p_node->type==GDParser::Node::TYPE_DICTIONARY) {
+
+		r_type.type=Variant::DICTIONARY;
+		return true;
+	} else if (p_node->type==GDParser::Node::TYPE_ARRAY) {
+
+		r_type.type=Variant::ARRAY;
+		return true;
+
+	} else if (p_node->type==GDParser::Node::TYPE_BUILT_IN_FUNCTION) {
+
+		MethodInfo mi = GDFunctions::get_info(static_cast<const GDParser::BuiltInFunctionNode*>(p_node)->function);
+		r_type.type=mi.return_val.type;
+		if (mi.return_val.hint==PROPERTY_HINT_RESOURCE_TYPE) {
+			r_type.obj_type=mi.return_val.hint_string;
+		}
+		return true;
+	} else if (p_node->type==GDParser::Node::TYPE_IDENTIFIER) {
+
+
+		r_type=_guess_identifier_type(p_class,p_line,static_cast<const GDParser::IdentifierNode *>(p_node)->name);
+		return true;
+	} else if (p_node->type==GDParser::Node::TYPE_SELF) {
+		//eeh...
+		return false;
+
+	} else if (p_node->type==GDParser::Node::TYPE_OPERATOR) {
+		const GDParser::OperatorNode *op = static_cast<const GDParser::OperatorNode *>(p_node);
+		if (op->op==GDParser::OperatorNode::OP_CALL) {
+
+			if (op->arguments[0]->type==GDParser::Node::TYPE_TYPE) {
+
+				const GDParser::TypeNode *tn = static_cast<const GDParser::TypeNode *>(op->arguments[0]);
+				r_type.type=tn->vtype;
+				return true;
+			} else if (op->arguments[0]->type==GDParser::Node::TYPE_BUILT_IN_FUNCTION) {
+
+
+				const GDParser::BuiltInFunctionNode *bin = static_cast<const GDParser::BuiltInFunctionNode *>(op->arguments[0]);
+				return _guess_identifier_type_in_expression(p_class,bin,p_line,r_type);
+
+			} else if (op->arguments.size()>1 && op->arguments[1]->type==GDParser::Node::TYPE_IDENTIFIER) {
+
+				GDCompletionIdentifier base;
+				if (!_guess_identifier_type_in_expression(p_class,op->arguments[0],p_line,base))
+					return false;
+				StringName id = static_cast<const GDParser::IdentifierNode *>(p_node)->name;
+				if (base.type==Variant::OBJECT) {
+
+					if (ObjectTypeDB::has_method(base.obj_type,id)) {
+						MethodBind *mb = ObjectTypeDB::get_method(base.obj_type,id);
+						PropertyInfo pi = mb->get_argument_info(-1);
+						r_type.type=pi.type;
+						if (pi.hint==PROPERTY_HINT_RESOURCE_TYPE) {
+							r_type.obj_type=pi.hint_string;
+						}
+					} else {
+						return false;
+					}
+				} else {
+					//method for some variant..
+					Variant::CallError ce;
+					Variant v = Variant::construct(base.type,NULL,0,ce);
+					List<MethodInfo> mi;
+					v.get_method_list(&mi);
+					for (List<MethodInfo>::Element *E=mi.front();E;E=E->next()) {
+
+						if (E->get().name==id.operator String()) {
+
+							MethodInfo mi = E->get();
+							r_type.type=mi.return_val.type;
+							if (mi.return_val.hint==PROPERTY_HINT_RESOURCE_TYPE) {
+								r_type.obj_type=mi.return_val.hint_string;
+							}
+							return true;
+						}
+					}
+
+				}
+
+
+			}
+		} else {
+
+			Variant::Operator vop = Variant::OP_MAX;
+			switch(op->op) {
+				case GDParser::OperatorNode::OP_ASSIGN_ADD: vop=Variant::OP_ADD; break;
+				case GDParser::OperatorNode::OP_ASSIGN_SUB: vop=Variant::OP_SUBSTRACT; break;
+				case GDParser::OperatorNode::OP_ASSIGN_MUL: vop=Variant::OP_MULTIPLY; break;
+				case GDParser::OperatorNode::OP_ASSIGN_DIV: vop=Variant::OP_DIVIDE; break;
+				case GDParser::OperatorNode::OP_ASSIGN_MOD: vop=Variant::OP_MODULE; break;
+				case GDParser::OperatorNode::OP_ASSIGN_SHIFT_LEFT: vop=Variant::OP_SHIFT_LEFT; break;
+				case GDParser::OperatorNode::OP_ASSIGN_SHIFT_RIGHT: vop=Variant::OP_SHIFT_RIGHT; break;
+				case GDParser::OperatorNode::OP_ASSIGN_BIT_AND: vop=Variant::OP_BIT_AND; break;
+				case GDParser::OperatorNode::OP_ASSIGN_BIT_OR: vop=Variant::OP_BIT_OR; break;
+				case GDParser::OperatorNode::OP_ASSIGN_BIT_XOR: vop=Variant::OP_BIT_XOR; break;
+				default:{}
+
+			}
+
+			if (vop==Variant::OP_MAX)
+				return false;
+
+			GDCompletionIdentifier p1;
+			GDCompletionIdentifier p2;
+
+			if (op->arguments[0]) {
+				if (!_guess_identifier_type_in_expression(p_class,op->arguments[0],p_line,p1))
+					return false;
+			}
+
+			if (op->arguments.size()>1) {
+				if (!_guess_identifier_type_in_expression(p_class,op->arguments[1],p_line,p2))
+					return false;
+			}
+
+			Variant::CallError ce;
+			Variant v1 = Variant::construct(p1.type,NULL,0,ce);
+			Variant v2 = Variant::construct(p2.type,NULL,0,ce);
+			// avoid potential invalid ops
+			if ((vop==Variant::OP_DIVIDE || vop==Variant::OP_MODULE) && v2.get_type()==Variant::INT) {
+				v2=1;
+			}
+			if (vop==Variant::OP_DIVIDE && v2.get_type()==Variant::REAL) {
+				v2=1.0;
+			}
+
+			Variant r;
+			bool valid;
+			Variant::evaluate(vop,v1,v2,r,valid);
+			if (!valid)
+				return false;
+			r_type.type=r.get_type();
+			return true;
+
+		}
+
+	}
+
+	return false;
+}
+
+static bool _guess_identifier_type_in_block(const GDParser::ClassNode *p_class,const GDParser::BlockNode *p_block,int p_line,const StringName& p_identifier,GDCompletionIdentifier &r_type) {
+
+
+	for(int i=0;i<p_block->sub_blocks.size();i++) {
+		//parse inner first
+		if (p_line>=p_block->sub_blocks[i]->line && (p_line<=p_block->sub_blocks[i]->end_line || p_block->sub_blocks[i]->end_line==-1)) {
+			if (_guess_identifier_type_in_block(p_class,p_block->sub_blocks[i],p_line,p_identifier,r_type))
+				return true;
+		}
+	}
+
+
+
+	const GDParser::Node *last_assign=NULL;
+	int last_assign_line=-1;
+
+	for (int i=0;i<p_block->statements.size();i++) {
+
+		if (p_block->statements[i]->line>p_line)
+			break;
+
+
+		if (p_block->statements[i]->type==GDParser::BlockNode::TYPE_LOCAL_VAR) {
+
+			const GDParser::LocalVarNode *lv=static_cast<const GDParser::LocalVarNode *>(p_block->statements[i]);
+			if (lv->assign && lv->name==p_identifier) {
+				last_assign=lv->assign;
+				last_assign_line=p_block->statements[i]->line;
+			}
+		}
+
+		if (p_block->statements[i]->type==GDParser::BlockNode::TYPE_OPERATOR) {
+			const GDParser::OperatorNode *op = static_cast<const GDParser::OperatorNode *>(p_block->statements[i]);
+			if (op->op==GDParser::OperatorNode::OP_ASSIGN) {
+
+				if (op->arguments.size() && op->arguments[0]->type==GDParser::Node::TYPE_IDENTIFIER) {
+					const GDParser::IdentifierNode *id = static_cast<const GDParser::IdentifierNode *>(op->arguments[0]);
+					if (id->name==p_identifier) {
+						last_assign=op->arguments[1];
+						last_assign_line=p_block->statements[i]->line;
+					}
+				}
+			}
+		}
+	}
+
+	//use the last assignment, (then backwards?)
+	if (last_assign) {
+		return _guess_identifier_type_in_expression(p_class,last_assign,last_assign_line-1,r_type);
+	}
+
+	return false;
+}
+
+static GDCompletionIdentifier _guess_identifier_type(const GDParser::ClassNode *p_class,int p_line,const StringName& p_identifier) {
+
+
+	return GDCompletionIdentifier();
+}
+
+static void _parse_expression_node(const GDParser::ClassNode *p_class,const GDParser::Node *p_node,int p_line,List<String>* r_options,List<String>::Element *p_indices) {
 
 
 
@@ -433,7 +660,7 @@ static void _parse_expression_node(const GDParser::Node *p_node,List<String>* r_
 	} else if (p_node->type==GDParser::Node::TYPE_DICTIONARY) {
 
 		const GDParser::DictionaryNode *dn=static_cast<const GDParser::DictionaryNode*>(p_node);
-		for(int i=0;i<dn->elements.size();i++) {
+		for (int i=0;i<dn->elements.size();i++) {
 
 			if (dn->elements[i].key->type==GDParser::Node::TYPE_CONSTANT) {
 
@@ -444,7 +671,7 @@ static void _parse_expression_node(const GDParser::Node *p_node,List<String>* r_
 					if (p_indices) {
 
 						if (str==p_indices->get()) {
-							_parse_expression_node(dn->elements[i].value,r_options,p_indices->next());
+							_parse_expression_node(p_class,dn->elements[i].value,p_line,r_options,p_indices->next());
 							return;
 						}
 
@@ -454,15 +681,28 @@ static void _parse_expression_node(const GDParser::Node *p_node,List<String>* r_
 				}
 			}
 		}
+	} else if (p_node->type==GDParser::Node::TYPE_BUILT_IN_FUNCTION) {
+
+		MethodInfo mi = GDFunctions::get_info(static_cast<const GDParser::BuiltInFunctionNode*>(p_node)->function);
+
+		Variant::CallError ce;
+		_parse_completion_variant(Variant::construct(mi.return_val.type,NULL,0,ce),r_options,p_indices?p_indices->next():NULL);
+	} else if (p_node->type==GDParser::Node::TYPE_IDENTIFIER) {
+
+		GDCompletionIdentifier idt = _guess_identifier_type(p_class,p_line-1,static_cast<const GDParser::IdentifierNode *>(p_node)->name);
+		//Variant::CallError ce;
+		//_parse_completion_variant(Variant::construct(mi.return_val.type,NULL,0,ce),r_options,p_indices?p_indices->next():NULL);
 	}
 }
 
-static bool _parse_completion_block(const GDParser::BlockNode *p_block,int p_line,List<String>* r_options,List<String>::Element *p_indices) {
+static bool _parse_completion_block(const GDParser::ClassNode *p_class,const GDParser::BlockNode *p_block,int p_line,List<String>* r_options,List<String>::Element *p_indices) {
+
+	print_line("COMPLETION BLOCK "+itos(p_block->line)+" -> "+itos(p_block->end_line));
 
 	for(int i=0;i<p_block->sub_blocks.size();i++) {
 		//parse inner first
 		if (p_line>=p_block->sub_blocks[i]->line && (p_line<=p_block->sub_blocks[i]->end_line || p_block->sub_blocks[i]->end_line==-1)) {
-			if (_parse_completion_block(p_block->sub_blocks[i],p_line,r_options,p_indices))
+			if (_parse_completion_block(p_class,p_block->sub_blocks[i],p_line,r_options,p_indices))
 				return true;
 		}
 	}
@@ -470,29 +710,39 @@ static bool _parse_completion_block(const GDParser::BlockNode *p_block,int p_lin
 	if (p_indices) {
 
 		//parse indices in expressions :|
+
+		const GDParser::Node *last_assign=NULL;
+		int last_assign_line=-1;
+
 		for (int i=0;i<p_block->statements.size();i++) {
 
 			if (p_block->statements[i]->line>p_line)
 				break;
 
+
 			if (p_block->statements[i]->type==GDParser::BlockNode::TYPE_LOCAL_VAR) {
 
-				const GDParser::LocalVarNode *lv=static_cast<const GDParser::LocalVarNode *>(p_block->statements[i]);
+				const GDParser::LocalVarNode *lv=static_cast<const GDParser::LocalVarNode *>(p_block->statements[i]);				
 				if (lv->assign && String(lv->name)==p_indices->get()) {
-
-					_parse_expression_node(lv->assign,r_options,p_indices->next());
-					return true;
+					last_assign=lv->assign;
+					last_assign_line=p_block->statements[i]->line;
 				}
 			}
 		}
 
+		//use the last assignment, (then backwards?)
+		if (last_assign) {
+			_parse_expression_node(p_class,last_assign,last_assign_line,r_options,p_indices->next());
+			return true;
+		}
+
 	} else {
+		//no indices, just add all variables and continue
 		for(int i=0;i<p_block->variables.size();i++) {
 			//parse variables second
 			if (p_line>=p_block->variable_lines[i]) {
 				r_options->push_back(p_block->variables[i]);
-			}
-			else break;
+			} else break;
 
 		}
 	}
@@ -545,13 +795,15 @@ static bool _parse_script_symbols(const Ref<GDScript>& p_script,bool p_static,Li
 
 static bool _parse_completion_class(const String& p_base_path,const GDParser::ClassNode *p_class,int p_line,List<String>* r_options,List<String>::Element *p_indices) {
 
-
-	static const char*_type_names[Variant::VARIANT_MAX]={
-		"null","bool","int","float","String","Vector2","Rect2","Vector3","Matrix32","Plane","Quat","AABB","Matrix3","Trasnform",
-		"Color","Image","NodePath","RID","Object","InputEvent","Dictionary","Array","RawArray","IntArray","FloatArray","StringArray",
-		"Vector2Array","Vector3Array","ColorArray"};
+	//checks known classes or built-in types for completion
 
 	if (p_indices && !p_indices->next()) {
+		//built-in types do not have sub-classes, try these first if no sub-indices exist.
+		static const char*_type_names[Variant::VARIANT_MAX]={
+			"null","bool","int","float","String","Vector2","Rect2","Vector3","Matrix32","Plane","Quat","AABB","Matrix3","Trasnform",
+			"Color","Image","NodePath","RID","Object","InputEvent","Dictionary","Array","RawArray","IntArray","FloatArray","StringArray",
+			"Vector2Array","Vector3Array","ColorArray"};
+
 		for(int i=0;i<Variant::VARIANT_MAX;i++) {
 
 			if (p_indices->get()==_type_names[i]) {
@@ -567,12 +819,12 @@ static bool _parse_completion_class(const String& p_base_path,const GDParser::Cl
 		}
 	}
 
-
+	// check the sub-classes of current class
 
 	for(int i=0;i<p_class->subclasses.size();i++) {
 
 		if (p_line>=p_class->subclasses[i]->line && (p_line<=p_class->subclasses[i]->end_line || p_class->subclasses[i]->end_line==-1)) {
-
+			// if OK in sub-classes, try completing the sub-class
 			if (_parse_completion_class(p_base_path,p_class->subclasses[i],p_line,r_options,p_indices))
 				return true;
 		}
@@ -586,7 +838,7 @@ static bool _parse_completion_class(const String& p_base_path,const GDParser::Cl
 
 		if (p_line>=fu->body->line && (p_line<=fu->body->end_line || fu->body->end_line==-1)) {
 			//if in function, first block stuff from outer to inner
-			if (_parse_completion_block(fu->body,p_line,r_options,p_indices))
+			if (_parse_completion_block(p_class,fu->body,p_line,r_options,p_indices))
 				return true;
 			//then function arguments
 			if (!p_indices) {
@@ -606,7 +858,7 @@ static bool _parse_completion_class(const String& p_base_path,const GDParser::Cl
 		if (p_line>=fu->body->line && (p_line<=fu->body->end_line || fu->body->end_line==-1)) {
 
 			//if in function, first block stuff from outer to inne
-			if (_parse_completion_block(fu->body,p_line,r_options,p_indices))
+			if (_parse_completion_block(p_class,fu->body,p_line,r_options,p_indices))
 				return true;
 			//then function arguments
 			if (!p_indices) {
@@ -757,24 +1009,30 @@ static bool _parse_completion_class(const String& p_base_path,const GDParser::Cl
 
 Error GDScriptLanguage::complete_keyword(const String& p_code, int p_line, const String& p_base_path, const String& p_base, List<String>* r_options) {
 
+
+
 	GDParser p;
 	Error err = p.parse(p_code,p_base_path);
 	// don't care much about error I guess
 	const GDParser::Node* root = p.get_parse_tree();
 	ERR_FAIL_COND_V(root->type!=GDParser::Node::TYPE_CLASS,ERR_INVALID_DATA);
 
+	print_line("BASE: "+p_base);
 	const GDParser::ClassNode *cl = static_cast<const GDParser::ClassNode*>(root);
 
 	List<String> indices;
 	Vector<String> spl = p_base.split(".");
 
 	for(int i=0;i<spl.size()-1;i++) {
+		print_line("INDEX "+itos(i)+":  "+spl[i]);
 		indices.push_back(spl[i]);
 	}
 
+	//parse completion inside of the class first
 	if (_parse_completion_class(p_base,cl,p_line,r_options,indices.front()))
 		return OK;
-	//and the globals x_x?
+
+	//if parsing completion inside of the class fails (none found), try using globals for completion
 	for(Map<StringName,int>::Element *E=globals.front();E;E=E->next()) {
 		if (!indices.empty()) {
 			if (String(E->key())==indices.front()->get()) {
diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp
index 933f270475..1db9886261 100644
--- a/scene/3d/camera.cpp
+++ b/scene/3d/camera.cpp
@@ -529,6 +529,8 @@ Vector3 Camera::project_ray_origin(const Point2& p_pos) const {
 
 		}
 
+
+
 		Vector3 ray;
 		ray.x = pos.x * (hsize) - hsize/2;
 		ray.y = (1.0 - pos.y) * (vsize) - vsize/2;
diff --git a/tools/export/blender25/io_scene_dae/export_dae.py b/tools/export/blender25/io_scene_dae/export_dae.py
index c41b60f2e6..4e1635429b 100644
--- a/tools/export/blender25/io_scene_dae/export_dae.py
+++ b/tools/export/blender25/io_scene_dae/export_dae.py
@@ -335,7 +335,7 @@ class DaeExporter:
 		return matid
 
 
-	def export_mesh(self,node,armature=None,skeyindex=-1,skel_source=None):
+	def export_mesh(self,node,armature=None,skeyindex=-1,skel_source=None,custom_name=None):
 
 		mesh = node.data
 
@@ -372,9 +372,9 @@ class DaeExporter:
 #				self.export_node(node,il,shape.name)
 				node.data.update()
 				if (armature and k==0):
-					md=self.export_mesh(node,armature,k,mid)
+					md=self.export_mesh(node,armature,k,mid,shape.name)
 				else:
-					md=self.export_mesh(node,None,k)
+					md=self.export_mesh(node,None,k,None,shape.name)
 
 				node.data = p
 				node.data.update()
@@ -596,7 +596,10 @@ class DaeExporter:
 
 
 		meshid = self.new_id("mesh")
-		self.writel(S_GEOM,1,'<geometry id="'+meshid+'" name="'+mesh.name+'">')
+		if (custom_name!=None):
+			self.writel(S_GEOM,1,'<geometry id="'+meshid+'" name="'+custom_name+'">')
+		else:
+			self.writel(S_GEOM,1,'<geometry id="'+meshid+'" name="'+mesh.name+'">')
 
 		self.writel(S_GEOM,2,'<mesh>')
 

From 3aed5de7a9220b1b2c8d059a7b6a39e638f74d92 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Mon, 8 Dec 2014 15:51:27 -0300
Subject: [PATCH 13/14] version update for rc2

---
 version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.py b/version.py
index a0e92c6016..1e88d24e54 100644
--- a/version.py
+++ b/version.py
@@ -2,6 +2,6 @@ short_name="godot"
 name="Godot Engine"
 major=1
 minor=0
-status="rc1"
+status="rc2"
 
 

From be4e40e90a5a322f6a7cec4893854ef5b15db600 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Mon, 8 Dec 2014 16:09:29 -0300
Subject: [PATCH 14/14] compilation fix

---
 modules/gdscript/gd_editor.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp
index 74d8259063..546fed4e8a 100644
--- a/modules/gdscript/gd_editor.cpp
+++ b/modules/gdscript/gd_editor.cpp
@@ -497,12 +497,17 @@ static bool _guess_identifier_type_in_expression(const GDParser::ClassNode *p_cl
 				if (base.type==Variant::OBJECT) {
 
 					if (ObjectTypeDB::has_method(base.obj_type,id)) {
+#ifdef TOOLS_ENABLED
 						MethodBind *mb = ObjectTypeDB::get_method(base.obj_type,id);
 						PropertyInfo pi = mb->get_argument_info(-1);
+
 						r_type.type=pi.type;
 						if (pi.hint==PROPERTY_HINT_RESOURCE_TYPE) {
 							r_type.obj_type=pi.hint_string;
 						}
+#else
+						return false;
+#endif
 					} else {
 						return false;
 					}
@@ -689,7 +694,7 @@ static void _parse_expression_node(const GDParser::ClassNode *p_class,const GDPa
 		_parse_completion_variant(Variant::construct(mi.return_val.type,NULL,0,ce),r_options,p_indices?p_indices->next():NULL);
 	} else if (p_node->type==GDParser::Node::TYPE_IDENTIFIER) {
 
-		GDCompletionIdentifier idt = _guess_identifier_type(p_class,p_line-1,static_cast<const GDParser::IdentifierNode *>(p_node)->name);
+		//GDCompletionIdentifier idt = _guess_identifier_type(p_class,p_line-1,static_cast<const GDParser::IdentifierNode *>(p_node)->name);
 		//Variant::CallError ce;
 		//_parse_completion_variant(Variant::construct(mi.return_val.type,NULL,0,ce),r_options,p_indices?p_indices->next():NULL);
 	}