Beta1 Attempt #1

-=-==-=-=-=-=-=-

-Small fixes in canvas item light shader
-Fixed compilation in server target
-Export for Android makes 32 bits display as default
-changed version to 1.1beta1
This commit is contained in:
Juan Linietsky 2015-04-02 12:59:23 -03:00
parent 1572238adb
commit 68e42f53ba
8 changed files with 66 additions and 8 deletions

View file

@ -1546,7 +1546,7 @@ EditorExportPlatformAndroid::EditorExportPlatformAndroid() {
quit_request=false;
orientation=0;
remove_prev=true;
use_32_fb=false;
use_32_fb=true;
device_thread=Thread::create(_device_poll_thread,this);
devices_changed=true;

View file

@ -56,7 +56,6 @@ void OS_Server::initialize(const VideoMode& p_desired,int p_video_driver,int p_a
args=OS::get_singleton()->get_cmdline_args();
current_videomode=p_desired;
main_loop=NULL;
rasterizer = memnew( RasterizerDummy );
@ -163,6 +162,12 @@ OS::VideoMode OS_Server::get_video_mode(int p_screen) const {
return current_videomode;
}
Size2 OS_Server::get_window_size() const {
return Vector2(current_videomode.width,current_videomode.height) ;
}
void OS_Server::get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen) const {

View file

@ -109,6 +109,8 @@ public:
virtual VideoMode get_video_mode(int p_screen=0) const;
virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const;
virtual Size2 get_window_size() const;
virtual void move_window_to_foreground();
void run();