diff options
| author | Juan Linietsky | 2016-01-25 10:30:47 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-01-25 10:30:47 -0300 |
| commit | 5245adcf81dd61ddb4eac048f6b004f3f455d7ed (patch) | |
| tree | 272c46c2ee422d9fe6d4dfaeca51fa52c264ffb3 /core | |
| parent | 07e79094802a2eb2d7c0cd64cecf673db386ec5a (diff) | |
| parent | 87517c564b83218871ac53afdad375a9501e6cb8 (diff) | |
| download | godot-5245adcf81dd61ddb4eac048f6b004f3f455d7ed.tar.gz godot-5245adcf81dd61ddb4eac048f6b004f3f455d7ed.tar.zst godot-5245adcf81dd61ddb4eac048f6b004f3f455d7ed.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'core')
| -rw-r--r-- | core/globals.cpp | 2 | ||||
| -rw-r--r-- | core/io/packet_peer.cpp | 2 | ||||
| -rw-r--r-- | core/os/os.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index 1e60854f2..5f5242073 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -1419,7 +1419,7 @@ Globals::Globals() { set("application/name","" ); set("application/main_scene",""); - custom_prop_info["application/main_scene"]=PropertyInfo(Variant::STRING,"application/main_scene",PROPERTY_HINT_FILE,"scn,res,xscn,xml"); + custom_prop_info["application/main_scene"]=PropertyInfo(Variant::STRING,"application/main_scene",PROPERTY_HINT_FILE,"scn,res,xscn,xml,tscn"); set("application/disable_stdout",false); set("application/use_shared_user_dir",true); diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp index 6cb3daa7a..973a2ec9a 100644 --- a/core/io/packet_peer.cpp +++ b/core/io/packet_peer.cpp @@ -243,7 +243,7 @@ int PacketPeerStream::get_max_packet_size() const { void PacketPeerStream::set_stream_peer(const Ref<StreamPeer> &p_peer) { - ERR_FAIL_COND(p_peer.is_null()); + //ERR_FAIL_COND(p_peer.is_null()); if (p_peer.ptr() != peer.ptr()) { ring_buffer.advance_read(ring_buffer.data_left()); // reset the ring buffer diff --git a/core/os/os.h b/core/os/os.h index bc3fad302..e53980a8f 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -76,7 +76,7 @@ public: bool fullscreen; bool resizable; float get_aspect() const { return (float)width/(float)height; } - VideoMode(int p_width=1280,int p_height=720,bool p_fullscreen=false, bool p_resizable = true) {width=p_width; height=p_height; fullscreen=p_fullscreen; resizable = p_resizable; } + VideoMode(int p_width=1024,int p_height=600,bool p_fullscreen=false, bool p_resizable = true) {width=p_width; height=p_height; fullscreen=p_fullscreen; resizable = p_resizable; } }; protected: friend class Main; |