-fixed export templates not loading/exporting on Windows

-fixed TouchScreenButton with stretch2d
-fixed(?) OSX crash on startup (test!!)
-compilation fixes on windows
-CollisionPolygon editor works again
-find buttons en find dialog
-TileMap editor cleanup (removed "error", made nicer)
-viewport flicker fixed
-make .scn default extension for saving scenes
-export the rest of the network classes to gdscript

1 files changed, 35 insertions, 28 deletions

diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp
index 0fdaab885a..13a158ea4d 100644
--- a/core/io/stream_peer_tcp.cpp
+++ b/core/io/stream_peer_tcp.cpp
@@ -26,31 +26,38 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "stream_peer_tcp.h"

-

-StreamPeerTCP* (*StreamPeerTCP::_create)()=NULL;

-

-void StreamPeerTCP::_bind_methods() {

-

-	ObjectTypeDB::bind_method(_MD("connect","host","ip"),&StreamPeerTCP::connect);

-	ObjectTypeDB::bind_method(_MD("is_connected"),&StreamPeerTCP::is_connected);

-	ObjectTypeDB::bind_method(_MD("get_connected_host"),&StreamPeerTCP::get_connected_host);

-	ObjectTypeDB::bind_method(_MD("get_connected_port"),&StreamPeerTCP::get_connected_port);

-	ObjectTypeDB::bind_method(_MD("disconnect"),&StreamPeerTCP::disconnect);

-}

-

-Ref<StreamPeerTCP> StreamPeerTCP::create() {

-

-	if (!_create)

-		return Ref<StreamPeerTCP>();

-	return Ref<StreamPeerTCP>(_create());

-}

-

-StreamPeerTCP::StreamPeerTCP() {

-

-}

-

-StreamPeerTCP::~StreamPeerTCP() {

-

-};

-

+#include "stream_peer_tcp.h"
+
+StreamPeerTCP* (*StreamPeerTCP::_create)()=NULL;
+
+void StreamPeerTCP::_bind_methods() {
+
+	ObjectTypeDB::bind_method(_MD("connect","host","ip"),&StreamPeerTCP::connect);
+	ObjectTypeDB::bind_method(_MD("is_connected"),&StreamPeerTCP::is_connected);
+	ObjectTypeDB::bind_method(_MD("get_connected_host"),&StreamPeerTCP::get_connected_host);
+	ObjectTypeDB::bind_method(_MD("get_connected_port"),&StreamPeerTCP::get_connected_port);
+	ObjectTypeDB::bind_method(_MD("disconnect"),&StreamPeerTCP::disconnect);
+}
+
+Ref<StreamPeerTCP> StreamPeerTCP::create_ref() {
+
+	if (!_create)
+		return Ref<StreamPeerTCP>();
+	return Ref<StreamPeerTCP>(_create());
+}
+
+StreamPeerTCP* StreamPeerTCP::create() {
+
+	if (!_create)
+		return NULL;
+	return _create();
+}
+
+StreamPeerTCP::StreamPeerTCP() {
+
+}
+
+StreamPeerTCP::~StreamPeerTCP() {
+
+};
+