-fix bug in cache for atlas import/export

-fix some menus
-fixed bug in out transition curves
-detect and remove file:/// in collada
-remove multiscript for now
-remove dependencies on mouse in OS, moved to Input
-avoid fscache from screwing up (fix might make it slower, but it works)
-funcref was missing, it's there now
This commit is contained in:
Juan Linietsky 2014-03-13 22:57:24 -03:00
parent a65edb4caa
commit 31ce3c5fd0
136 changed files with 10784 additions and 1578 deletions

View file

@ -422,6 +422,8 @@ void OSIPhone::get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen) c
bool OSIPhone::can_draw() const {
if (native_video_is_playing())
return false;
return true;
};
@ -483,6 +485,31 @@ String OSIPhone::get_locale() const {
return locale_code;
}
extern bool _play_video(String p_path);
extern bool _is_video_playing();
extern void _pause_video();
extern void _stop_video();
Error OSIPhone::native_video_play(String p_path) {
if ( _play_video(p_path) )
return OK;
return FAILED;
}
bool OSIPhone::native_video_is_playing() const {
return _is_video_playing();
}
void OSIPhone::native_video_pause() {
if (native_video_is_playing())
_pause_video();
}
void OSIPhone::native_video_stop() {
if (native_video_is_playing())
_stop_video();
}
OSIPhone::OSIPhone(int width, int height) {
rasterizer_gles22 = NULL;