Lots of work on Audio & Physics engine:

-Added new 3D stream player node
-Added ability for Area to capture sound from streams
-Added small features in physics to be able to properly guess distance to areas for sound
-Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children
-Fixed KinematicBody API to make it the same as 2D.

1 files changed, 72 insertions, 0 deletions

diff --git a/scene/3d/collision_shape.h b/scene/3d/collision_shape.h
new file mode 100644
index 0000000000..277e0dfa77
--- /dev/null
+++ b/scene/3d/collision_shape.h
@@ -0,0 +1,72 @@
+/*************************************************************************/
+/*  body_shape.h                                                         */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#ifndef COLLISION_SHAPE_H
+#define COLLISION_SHAPE_H
+
+#include "scene/3d/spatial.h"
+#include "scene/resources/shape.h"
+class CollisionObject;
+class CollisionShape : public Spatial {
+
+	GDCLASS(CollisionShape, Spatial);
+	OBJ_CATEGORY("3D Physics Nodes");
+
+	Ref<Shape> shape;
+
+	uint32_t owner_id;
+	CollisionObject *parent;
+
+	Node *debug_shape;
+
+	void resource_changed(RES res);
+	bool disabled;
+
+	void _create_debug_shape();
+
+protected:
+	void _notification(int p_what);
+	static void _bind_methods();
+
+public:
+	void make_convex_from_brothers();
+
+	void set_shape(const Ref<Shape> &p_shape);
+	Ref<Shape> get_shape() const;
+
+	void set_disabled(bool p_disabled);
+	bool is_disabled() const;
+
+	String get_configuration_warning() const;
+
+	CollisionShape();
+	~CollisionShape();
+};
+
+#endif // BODY_VOLUME_H