diff options
author | Juan Linietsky <reduzio@gmail.com> | 2014-11-17 07:46:11 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2014-11-17 07:46:11 -0300 |
commit | d5cb758d36035fc35e960a466d0b370ff19e4f76 (patch) | |
tree | be190717a7b8cd3924c3d9ff3ba5f5237cd26d41 /core/bind | |
parent | 56b30b31e4df887a5b7b5c70a87597d250482c1f (diff) |
NavMesh
-=-=-=-
-Fixed NavMesh API
-New NavMesh demo
-Support for animated Particles2D
-Fixes for native video playback on iOS
Diffstat (limited to 'core/bind')
-rw-r--r-- | core/bind/core_bind.cpp | 4 | ||||
-rw-r--r-- | core/bind/core_bind.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 513c7a9470..f50330447c 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -577,9 +577,9 @@ float _OS::get_frames_per_second() const { return OS::get_singleton()->get_frames_per_second(); } -Error _OS::native_video_play(String p_path, float p_volume) { +Error _OS::native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track) { - return OS::get_singleton()->native_video_play(p_path, p_volume); + return OS::get_singleton()->native_video_play(p_path, p_volume, p_audio_track, p_subtitle_track); }; bool _OS::native_video_is_playing() { diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index b3040a96ca..101dc1ab94 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -108,7 +108,7 @@ public: bool is_video_mode_resizable(int p_screen=0) const; Array get_fullscreen_mode_list(int p_screen=0) const; - Error native_video_play(String p_path, float p_volume); + Error native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track); bool native_video_is_playing(); void native_video_pause(); void native_video_stop(); |