Merge branch 'develop' into modnark

src/include/DataModelV2/PartInstance.h

@@ -56,11 +56,13 @@ public:
 	void setAnchored(bool anchored);
 	bool isAnchored();
 	float getMass();
+	bool isDragging();
+	void setDragging(bool value);
 
 	//Collision
 	bool collides(PartInstance * part);
 	bool collides(Box);
-
+	
 	//Properties
 	virtual std::vector<PROPGRIDITEM> getProperties();
 	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
@@ -71,6 +73,7 @@ private:
 	Vector3 velocity;
 	Vector3 rotVelocity;
 	bool changed;
+	bool dragging;
 	Box itemBox;
 	GLuint glList;
 };

src/include/XplicitNgine/XplicitNgine.h

@@ -15,5 +15,6 @@ public:
 	void step(float stepSize);
 	void createBody(PartInstance* partInstance);
 	void deleteBody(PartInstance* partInstance);
-	void updateBody(PartInstance* partInstance, CoordinateFrame * cFrame);
+	void updateBody(PartInstance* partInstance);
+	void resetBody(PartInstance* partInstance);
 };

src/include/versioning.h

@@ -1,11 +1,11 @@
 #ifndef APP_GENER
 
-#define SNAPSHOT_VERSION
+//#define SNAPSHOT_VERSION
 
 #define APP_GENER 0
 #define APP_MAJOR 0
 #define APP_MINOR 107
-#define APP_PATCH 0
+#define APP_PATCH 2
 #define APP_VER_STRING APP_GENER.APP_MAJOR.APP_MINOR.APP_PATCH