Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

custom changes, do not push

Browse Source
This commit is contained in:
Ariel Manzur
2017-07-14 03:12:24 -03:00
parent b59e5c5b47
commit 24db850a46
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/io/resource_format_binary.cpp
View File

@@ -2273,6 +2273,7 @@ void ResourceFormatSaverBinary::get_recognized_extensions(const RES& p_resource,
String base = p_resource->get_base_extension().to_lower();
p_extensions->push_back(base);
p_extensions->push_back("res");
}

4
scene/2d/physics_body_2d.cpp
View File

@@ -1410,7 +1410,9 @@ void KinematicBody2D::_bind_methods() {
}
KinematicBody2D::KinematicBody2D() : PhysicsBody2D(Physics2DServer::BODY_MODE_KINEMATIC){
KinematicBody2D::KinematicBody2D() : RigidBody2D(){
set_mode(MODE_KINEMATIC);
colliding=false;
collider=0;

4
scene/2d/physics_body_2d.h
View File

@@ -288,9 +288,9 @@ VARIANT_ENUM_CAST(RigidBody2D::CCDMode);
class KinematicBody2D : public PhysicsBody2D {
class KinematicBody2D : public RigidBody2D {
OBJ_TYPE(KinematicBody2D,PhysicsBody2D);
OBJ_TYPE(KinematicBody2D,RigidBody2D);
float margin;
bool colliding;