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/os | |
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/os')
-rw-r--r-- | core/os/os.cpp | 2 | ||||
-rw-r--r-- | core/os/os.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index 53ca7c3a49..e56f4a4904 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -438,7 +438,7 @@ int OS::get_processor_count() const { return 1; } -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 FAILED; }; diff --git a/core/os/os.h b/core/os/os.h index ed7e1e4324..5e084f6373 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -323,7 +323,7 @@ public: virtual String get_unique_ID() const; - virtual Error native_video_play(String p_path, float p_volume); + virtual Error native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track); virtual bool native_video_is_playing() const; virtual void native_video_pause(); virtual void native_video_stop(); |