Просмотр исходного кода
Merge branch 'next-setaylor' of https://github.com/blackberry-gaming/GamePlay into next-setaylor
Conflicts: gameplay-api/html/_absolute_layout_8h_source.html gameplay-api/html/_animation_8h_source.html gameplay-api/html/_animation_clip_8h_source.html gameplay-api/html/_animation_controller_8h_source.html gameplay-api/html/_animation_target_8h_source.html gameplay-api/html/_animation_value_8h_source.html gameplay-api/html/_audio_buffer_8h_source.html gameplay-api/html/_audio_controller_8h_source.html gameplay-api/html/_audio_listener_8h_source.html gameplay-api/html/_audio_source_8h_source.html gameplay-api/html/_base_8h_source.html gameplay-api/html/_bounding_box_8h_source.html gameplay-api/html/_bounding_sphere_8h_source.html gameplay-api/html/_button_8h_source.html gameplay-api/html/_camera_8h_source.html gameplay-api/html/_check_box_8h_source.html gameplay-api/html/_container_8h_source.html gameplay-api/html/_control_8h_source.html gameplay-api/html/_curve_8h_source.html gameplay-api/html/_debug_new_8h_source.html gameplay-api/html/_depth_stencil_target_8h_source.html gameplay-api/html/_effect_8h_source.html gameplay-api/html/_file_system_8h_source.html gameplay-api/html/_font_8h_source.html gameplay-api/html/_form_8h_source.html gameplay-api/html/_frame_buffer_8h_source.html gameplay-api/html/_frustum_8h_source.html gameplay-api/html/_game_8h_source.html gameplay-api/html/_image_8h_source.html gameplay-api/html/_joint_8h_source.html gameplay-api/html/_keyboard_8h_source.html gameplay-api/html/_label_8h_source.html gameplay-api/html/_layout_8h_source.html gameplay-api/html/_light_8h_source.html gameplay-api/html/_material_8h_source.html gameplay-api/html/_material_parameter_8h_source.html gameplay-api/html/_matrix_8h_source.html gameplay-api/html/_mesh_8h_source.html gameplay-api/html/_mesh_batch_8h_source.html gameplay-api/html/_mesh_part_8h_source.html gameplay-api/html/_mesh_skin_8h_source.html gameplay-api/html/_model_8h_source.html gameplay-api/html/_mouse_8h_source.html gameplay-api/html/_node_8h_source.html gameplay-api/html/_package_8h_source.html gameplay-api/html/_particle_emitter_8h_source.html gameplay-api/html/_pass_8h_source.html gameplay-api/html/_physics_character_8h_source.html gameplay-api/html/_physics_constraint_8h_source.html gameplay-api/html/_physics_controller_8h_source.html gameplay-api/html/_physics_fixed_constraint_8h_source.html gameplay-api/html/_physics_generic_constraint_8h_source.html gameplay-api/html/_physics_hinge_constraint_8h_source.html gameplay-api/html/_physics_motion_state_8h_source.html gameplay-api/html/_physics_rigid_body_8h_source.html gameplay-api/html/_physics_socket_constraint_8h_source.html gameplay-api/html/_physics_spring_constraint_8h_source.html gameplay-api/html/_plane_8h_source.html gameplay-api/html/_platform_8h_source.html gameplay-api/html/_properties_8h_source.html gameplay-api/html/_quaternion_8h_source.html gameplay-api/html/_radio_button_8h_source.html gameplay-api/html/_ray_8h_source.html gameplay-api/html/_rectangle_8h_source.html gameplay-api/html/_ref_8h_source.html gameplay-api/html/_render_state_8h_source.html gameplay-api/html/_render_target_8h_source.html gameplay-api/html/_scene_8h_source.html gameplay-api/html/_scene_loader_8h_source.html gameplay-api/html/_slider_8h_source.html gameplay-api/html/_sprite_batch_8h_source.html gameplay-api/html/_technique_8h_source.html gameplay-api/html/_text_box_8h_source.html gameplay-api/html/_texture_8h_source.html gameplay-api/html/_theme_8h_source.html gameplay-api/html/_time_listener_8h_source.html gameplay-api/html/_touch_8h_source.html gameplay-api/html/_transform_8h_source.html gameplay-api/html/_vector2_8h_source.html gameplay-api/html/_vector3_8h_source.html gameplay-api/html/_vector4_8h_source.html gameplay-api/html/_vertex_attribute_binding_8h_source.html gameplay-api/html/_vertex_format_8h_source.html gameplay-api/html/_vertical_layout_8h_source.html gameplay-api/html/annotated.html gameplay-api/html/classes.html gameplay-api/html/classgameplay_1_1_absolute_layout-members.html gameplay-api/html/classgameplay_1_1_absolute_layout.html gameplay-api/html/classgameplay_1_1_animation-members.html gameplay-api/html/classgameplay_1_1_animation.html gameplay-api/html/classgameplay_1_1_animation_clip-members.html gameplay-api/html/classgameplay_1_1_animation_clip.html gameplay-api/html/classgameplay_1_1_animation_clip_1_1_listener-members.html gameplay-api/html/classgameplay_1_1_animation_clip_1_1_listener.html gameplay-api/html/classgameplay_1_1_animation_controller-members.html gameplay-api/html/classgameplay_1_1_animation_controller.html gameplay-api/html/classgameplay_1_1_animation_target-members.html gameplay-api/html/classgameplay_1_1_animation_target.html gameplay-api/html/classgameplay_1_1_animation_value-members.html gameplay-api/html/classgameplay_1_1_animation_value.html gameplay-api/html/classgameplay_1_1_audio_buffer-members.html gameplay-api/html/classgameplay_1_1_audio_buffer.html gameplay-api/html/classgameplay_1_1_audio_controller-members.html gameplay-api/html/classgameplay_1_1_audio_controller.html gameplay-api/html/classgameplay_1_1_audio_listener-members.html gameplay-api/html/classgameplay_1_1_audio_listener.html gameplay-api/html/classgameplay_1_1_audio_source-members.html gameplay-api/html/classgameplay_1_1_audio_source.html gameplay-api/html/classgameplay_1_1_bounding_box-members.html gameplay-api/html/classgameplay_1_1_bounding_box.html gameplay-api/html/classgameplay_1_1_bounding_sphere-members.html gameplay-api/html/classgameplay_1_1_bounding_sphere.html gameplay-api/html/classgameplay_1_1_button-members.html gameplay-api/html/classgameplay_1_1_button.html gameplay-api/html/classgameplay_1_1_camera-members.html gameplay-api/html/classgameplay_1_1_camera.html gameplay-api/html/classgameplay_1_1_check_box-members.html gameplay-api/html/classgameplay_1_1_check_box.html gameplay-api/html/classgameplay_1_1_closest_not_me_convex_result_callback-members.html gameplay-api/html/classgameplay_1_1_closest_not_me_convex_result_callback.html gameplay-api/html/classgameplay_1_1_container-members.html gameplay-api/html/classgameplay_1_1_container.html gameplay-api/html/classgameplay_1_1_control-members.html gameplay-api/html/classgameplay_1_1_control.html gameplay-api/html/classgameplay_1_1_control_1_1_listener-members.html gameplay-api/html/classgameplay_1_1_curve-members.html gameplay-api/html/classgameplay_1_1_curve.html gameplay-api/html/classgameplay_1_1_depth_stencil_target-members.html gameplay-api/html/classgameplay_1_1_depth_stencil_target.html gameplay-api/html/classgameplay_1_1_effect-members.html gameplay-api/html/classgameplay_1_1_effect.html gameplay-api/html/classgameplay_1_1_file_system-members.html gameplay-api/html/classgameplay_1_1_file_system.html gameplay-api/html/classgameplay_1_1_font-members.html gameplay-api/html/classgameplay_1_1_font.html gameplay-api/html/classgameplay_1_1_font_1_1_glyph-members.html gameplay-api/html/classgameplay_1_1_font_1_1_glyph.html gameplay-api/html/classgameplay_1_1_form-members.html gameplay-api/html/classgameplay_1_1_form.html gameplay-api/html/classgameplay_1_1_frame_buffer-members.html gameplay-api/html/classgameplay_1_1_frame_buffer.html gameplay-api/html/classgameplay_1_1_frustum-members.html gameplay-api/html/classgameplay_1_1_frustum.html gameplay-api/html/classgameplay_1_1_game-members.html gameplay-api/html/classgameplay_1_1_game.html gameplay-api/html/classgameplay_1_1_image-members.html gameplay-api/html/classgameplay_1_1_image.html gameplay-api/html/classgameplay_1_1_joint-members.html gameplay-api/html/classgameplay_1_1_joint.html gameplay-api/html/classgameplay_1_1_keyboard-members.html gameplay-api/html/classgameplay_1_1_keyboard.html gameplay-api/html/classgameplay_1_1_label-members.html gameplay-api/html/classgameplay_1_1_label.html gameplay-api/html/classgameplay_1_1_layout-members.html gameplay-api/html/classgameplay_1_1_layout.html gameplay-api/html/classgameplay_1_1_light-members.html gameplay-api/html/classgameplay_1_1_light.html gameplay-api/html/classgameplay_1_1_material-members.html gameplay-api/html/classgameplay_1_1_material.html gameplay-api/html/classgameplay_1_1_material_parameter-members.html gameplay-api/html/classgameplay_1_1_material_parameter.html gameplay-api/html/classgameplay_1_1_matrix-members.html gameplay-api/html/classgameplay_1_1_matrix.html gameplay-api/html/classgameplay_1_1_mesh-members.html gameplay-api/html/classgameplay_1_1_mesh.html gameplay-api/html/classgameplay_1_1_mesh_batch-members.html gameplay-api/html/classgameplay_1_1_mesh_batch.html gameplay-api/html/classgameplay_1_1_mesh_part-members.html gameplay-api/html/classgameplay_1_1_mesh_part.html gameplay-api/html/classgameplay_1_1_mesh_skin-members.html gameplay-api/html/classgameplay_1_1_mesh_skin.html gameplay-api/html/classgameplay_1_1_model-members.html gameplay-api/html/classgameplay_1_1_model.html gameplay-api/html/classgameplay_1_1_mouse-members.html gameplay-api/html/classgameplay_1_1_mouse.html gameplay-api/html/classgameplay_1_1_node-members.html gameplay-api/html/classgameplay_1_1_node.html gameplay-api/html/classgameplay_1_1_node_clone_context-members.html gameplay-api/html/classgameplay_1_1_package-members.html gameplay-api/html/classgameplay_1_1_package.html gameplay-api/html/classgameplay_1_1_particle_emitter-members.html gameplay-api/html/classgameplay_1_1_particle_emitter.html gameplay-api/html/classgameplay_1_1_pass-members.html gameplay-api/html/classgameplay_1_1_pass.html gameplay-api/html/classgameplay_1_1_physics_character-members.html gameplay-api/html/classgameplay_1_1_physics_character.html gameplay-api/html/classgameplay_1_1_physics_collision_object_1_1_collision_listener-members.html gameplay-api/html/classgameplay_1_1_physics_collision_object_1_1_collision_listener.html gameplay-api/html/classgameplay_1_1_physics_collision_object_1_1_collision_pair.html gameplay-api/html/classgameplay_1_1_physics_constraint-members.html gameplay-api/html/classgameplay_1_1_physics_constraint.html gameplay-api/html/classgameplay_1_1_physics_controller-members.html gameplay-api/html/classgameplay_1_1_physics_controller.html gameplay-api/html/classgameplay_1_1_physics_controller_1_1_listener-members.html gameplay-api/html/classgameplay_1_1_physics_controller_1_1_listener.html gameplay-api/html/classgameplay_1_1_physics_fixed_constraint-members.html gameplay-api/html/classgameplay_1_1_physics_fixed_constraint.html gameplay-api/html/classgameplay_1_1_physics_generic_constraint-members.html gameplay-api/html/classgameplay_1_1_physics_generic_constraint.html gameplay-api/html/classgameplay_1_1_physics_hinge_constraint-members.html gameplay-api/html/classgameplay_1_1_physics_hinge_constraint.html gameplay-api/html/classgameplay_1_1_physics_motion_state-members.html gameplay-api/html/classgameplay_1_1_physics_motion_state.html gameplay-api/html/classgameplay_1_1_physics_rigid_body-members.html gameplay-api/html/classgameplay_1_1_physics_rigid_body.html gameplay-api/html/classgameplay_1_1_physics_socket_constraint-members.html gameplay-api/html/classgameplay_1_1_physics_socket_constraint.html gameplay-api/html/classgameplay_1_1_physics_spring_constraint-members.html gameplay-api/html/classgameplay_1_1_physics_spring_constraint.html gameplay-api/html/classgameplay_1_1_plane-members.html gameplay-api/html/classgameplay_1_1_plane.html gameplay-api/html/classgameplay_1_1_platform-members.html gameplay-api/html/classgameplay_1_1_platform.html gameplay-api/html/classgameplay_1_1_properties-members.html gameplay-api/html/classgameplay_1_1_properties.html gameplay-api/html/classgameplay_1_1_quaternion-members.html gameplay-api/html/classgameplay_1_1_quaternion.html gameplay-api/html/classgameplay_1_1_radio_button-members.html gameplay-api/html/classgameplay_1_1_radio_button.html gameplay-api/html/classgameplay_1_1_ray-members.html gameplay-api/html/classgameplay_1_1_ray.html gameplay-api/html/classgameplay_1_1_rectangle-members.html gameplay-api/html/classgameplay_1_1_rectangle.html gameplay-api/html/classgameplay_1_1_ref-members.html gameplay-api/html/classgameplay_1_1_ref.html gameplay-api/html/classgameplay_1_1_render_state-members.html gameplay-api/html/classgameplay_1_1_render_state.html gameplay-api/html/classgameplay_1_1_render_state_1_1_state_block-members.html gameplay-api/html/classgameplay_1_1_render_state_1_1_state_block.html gameplay-api/html/classgameplay_1_1_render_target-members.html gameplay-api/html/classgameplay_1_1_render_target.html gameplay-api/html/classgameplay_1_1_scene-members.html gameplay-api/html/classgameplay_1_1_scene.html gameplay-api/html/classgameplay_1_1_scene_loader-members.html gameplay-api/html/classgameplay_1_1_scene_loader.html gameplay-api/html/classgameplay_1_1_screen_displayer-members.html gameplay-api/html/classgameplay_1_1_screen_displayer.html gameplay-api/html/classgameplay_1_1_slider-members.html gameplay-api/html/classgameplay_1_1_slider.html gameplay-api/html/classgameplay_1_1_sprite_batch-members.html gameplay-api/html/classgameplay_1_1_sprite_batch.html gameplay-api/html/classgameplay_1_1_technique-members.html gameplay-api/html/classgameplay_1_1_technique.html gameplay-api/html/classgameplay_1_1_text_box-members.html gameplay-api/html/classgameplay_1_1_text_box.html gameplay-api/html/classgameplay_1_1_texture-members.html gameplay-api/html/classgameplay_1_1_texture.html gameplay-api/html/classgameplay_1_1_texture_1_1_sampler-members.html gameplay-api/html/classgameplay_1_1_texture_1_1_sampler.html gameplay-api/html/classgameplay_1_1_theme-members.html gameplay-api/html/classgameplay_1_1_theme.html gameplay-api/html/classgameplay_1_1_theme_1_1_style-members.html gameplay-api/html/classgameplay_1_1_theme_1_1_style.html gameplay-api/html/classgameplay_1_1_time_listener-members.html gameplay-api/html/classgameplay_1_1_time_listener.html gameplay-api/html/classgameplay_1_1_touch-members.html gameplay-api/html/classgameplay_1_1_touch.html gameplay-api/html/classgameplay_1_1_transform-members.html gameplay-api/html/classgameplay_1_1_transform.html gameplay-api/html/classgameplay_1_1_transform_1_1_listener-members.html gameplay-api/html/classgameplay_1_1_transform_1_1_listener.html gameplay-api/html/classgameplay_1_1_uniform-members.html gameplay-api/html/classgameplay_1_1_uniform.html gameplay-api/html/classgameplay_1_1_vector2-members.html gameplay-api/html/classgameplay_1_1_vector2.html gameplay-api/html/classgameplay_1_1_vector3-members.html gameplay-api/html/classgameplay_1_1_vector3.html gameplay-api/html/classgameplay_1_1_vector4-members.html gameplay-api/html/classgameplay_1_1_vector4.html gameplay-api/html/classgameplay_1_1_vertex_attribute_binding-members.html gameplay-api/html/classgameplay_1_1_vertex_attribute_binding.html gameplay-api/html/classgameplay_1_1_vertex_format-members.html gameplay-api/html/classgameplay_1_1_vertex_format.html gameplay-api/html/classgameplay_1_1_vertex_format_1_1_element-members.html gameplay-api/html/classgameplay_1_1_vertex_format_1_1_element.html gameplay-api/html/classgameplay_1_1_vertical_layout-members.html gameplay-api/html/classgameplay_1_1_vertical_layout.html gameplay-api/html/files.html gameplay-api/html/functions.html gameplay-api/html/functions_0x62.html gameplay-api/html/functions_0x63.html gameplay-api/html/functions_0x64.html gameplay-api/html/functions_0x65.html gameplay-api/html/functions_0x66.html gameplay-api/html/functions_0x67.html gameplay-api/html/functions_0x68.html gameplay-api/html/functions_0x69.html gameplay-api/html/functions_0x6a.html gameplay-api/html/functions_0x6b.html gameplay-api/html/functions_0x6c.html gameplay-api/html/functions_0x6d.html gameplay-api/html/functions_0x6e.html gameplay-api/html/functions_0x6f.html gameplay-api/html/functions_0x70.html gameplay-api/html/functions_0x71.html gameplay-api/html/functions_0x72.html gameplay-api/html/functions_0x73.html gameplay-api/html/functions_0x74.html gameplay-api/html/functions_0x75.html gameplay-api/html/functions_0x76.html gameplay-api/html/functions_0x77.html gameplay-api/html/functions_0x78.html gameplay-api/html/functions_0x79.html gameplay-api/html/functions_0x7a.html gameplay-api/html/functions_0x7e.html gameplay-api/html/functions_enum.html gameplay-api/html/functions_eval.html gameplay-api/html/functions_func.html gameplay-api/html/functions_func_0x62.html gameplay-api/html/functions_func_0x63.html gameplay-api/html/functions_func_0x64.html gameplay-api/html/functions_func_0x65.html gameplay-api/html/functions_func_0x66.html gameplay-api/html/functions_func_0x67.html gameplay-api/html/functions_func_0x68.html gameplay-api/html/functions_func_0x69.html gameplay-api/html/functions_func_0x6a.html gameplay-api/html/functions_func_0x6b.html gameplay-api/html/functions_func_0x6c.html gameplay-api/html/functions_func_0x6d.html gameplay-api/html/functions_func_0x6e.html gameplay-api/html/functions_func_0x6f.html gameplay-api/html/functions_func_0x70.html gameplay-api/html/functions_func_0x71.html gameplay-api/html/functions_func_0x72.html gameplay-api/html/functions_func_0x73.html gameplay-api/html/functions_func_0x74.html gameplay-api/html/functions_func_0x75.html gameplay-api/html/functions_func_0x76.html gameplay-api/html/functions_func_0x7a.html gameplay-api/html/functions_func_0x7e.html gameplay-api/html/functions_type.html gameplay-api/html/functions_vars.html gameplay-api/html/gameplay_8h_source.html gameplay-api/html/hierarchy.html gameplay-api/html/index.html gameplay-api/html/search/classes_68.html gameplay-api/html/search/enums_64.html gameplay-api/html/structgameplay_1_1_collides_with_callback.html gameplay-api/html/structgameplay_1_1_debug_vertex-members.html gameplay-api/html/structgameplay_1_1_debug_vertex.html gameplay-api/html/structgameplay_1_1_node_1_1_user_data-members.html gameplay-api/html/structgameplay_1_1_node_1_1_user_data.html gameplay-api/html/structgameplay_1_1_physics_controller_1_1_debug_drawer_1_1_debug_vertex-members.html gameplay-api/html/structgameplay_1_1_physics_controller_1_1_debug_drawer_1_1_debug_vertex.html gameplay-api/html/structgameplay_1_1_physics_rigid_body_1_1_parameters-members.html gameplay-api/html/structgameplay_1_1_sprite_vertex-members.html gameplay-api/html/structgameplay_1_1_sprite_vertex.html gameplay-api/html/structgameplay_1_1_theme_1_1_side_regions.html gameplay-api/html/structgameplay_1_1_theme_1_1_u_vs-members.html gameplay-api/html/structgameplay_1_1_theme_1_1_u_vs.html gameplay-api/html/structgameplay_1_1_transform_1_1_transform_listener-members.html gameplay-api/html/structgameplay_1_1_transform_1_1_transform_listener.html
setaylor