Merge pull request #262 from raysan5/develop

Integrate develop branch

.gitignore

@@ -42,6 +42,7 @@ Thumbs.db
 *.sbr
 *.sdf
 obj/
+[Rr]elease/
 [Rr]elease.win32/
 _ReSharper*/
 [Tt]est[Rr]esult*
@@ -109,3 +110,7 @@ project/vs2015/*.opendb
 !project/vs2015/external/openal_soft/lib/win64/OpenAL32.dll
 !project/vs2015/external/lua/lib/win32/lua53.dll
 
+# Web examples 
+docs/examples/web/*.html
+docs/examples/web/*/*.html
+!docs/examples/web/loader.html

docs/common/js/examples.js

@@ -20,109 +20,54 @@ $(document).ready(function() {
         'core_3d_camera_first_person',
         'core_2d_camera',
         'core_world_screen',
-        'core_oculus_rift',
+        'core_vr_simulator',
         'shapes_logo_raylib',
         'shapes_basic_shapes',
         'shapes_colors_palette',
         'shapes_logo_raylib_anim',
+        'shapes_lines_bezier',
         'textures_logo_raylib',
         'textures_image_loading',
         'textures_rectangle',
         'textures_srcrec_dstrec',
         'textures_to_image',
         'textures_raw_data',
-        'textures_formats_loading',
-        'textures_particles_trail_blending',
         'textures_image_processing',
         'textures_image_drawing',
         'text_sprite_fonts',
         'text_bmfont_ttf',
-        'text_rbmf_fonts',
+        'text_raylib_fonts',
         'text_format_text',
-        'text_font_select',
         'text_writing_anim',
         'text_ttf_loading',
         'text_bmfont_unordered',
+        'text_input_box',
         'models_geometric_shapes',
         'models_box_collisions',
         'models_billboard',
         'models_obj_loading',
         'models_heightmap',
         'models_cubicmap',
+        'models_mesh_picking',
         'shaders_model_shader',
         'shaders_shapes_textures',
         'shaders_custom_uniform',
         'shaders_postprocessing',
-        'shaders_standard_lighting',
         'audio_sound_loading',
         'audio_music_stream',
         'audio_module_playing',
         'audio_raw_stream'];
 
-    var exampleDesc = [
-        'basic window',
-        'input keys', 
-        'input mouse',
-        'mouse wheel',
-        'input gamepad',
-        'random values',
-        'color select',
-        'drop files',
-        'storage values',
-        'gestures detection',
-        '3d mode',
-        '3d picking',
-        '3d camera free',
-        '3d camera first person',
-        '2d camera',
-        'world screen',
-        'oculus rift',
-        'logo raylib shapes',
-        'basic shapes',
-        'colors palette',
-        'logo raylib anim',
-        'logo raylib texture',
-        'image loading',
-        'texture rectangle',
-        'src-dest. rectangles',
-        'texture to image',
-        'raw data loading',
-        'textures formats loading',
-        'particles trail blending',
-        'image processing',
-        'image drawing',
-        'sprite fonts',
-        'bmfonts ttf',
-        'rbmf fonts',
-        'text formatting',
-        'font selection',
-        'writing animation',
-        'ttf loading',
-        'bmfont unordered',
-        'geometric shapes',
-        'box collisions',
-        'billboard drawing',
-        'obj loading',
-        'heightmap loading',
-        'cubesmap loading',
-        'model shader',
-        'shapes textures shader',
-        'custom uniform in shaders',
-        'postprocessing shaders',
-        'standard lighting',
-        'sound loading',
-        'music streaming',
-        'module playing',
-        'raw stream'];
-
     for (var i = 0; i < exampleName.length; i++)
     {
         var filterType = exampleName[i].substring(0, exampleName[i].indexOf("_"));
+        var exampleBase = exampleName[i].slice(exampleName[i].indexOf('_') + 1);
+        var exampleDesc = exampleBase.replace('_', ' ');
 
         $('#container').append(
             '<div class="mix f' + filterType + '">' +
-            '<a class="fancybox fancybox.iframe" href="examples/web/loader.html?name=' + exampleName[i] + '" title="' + exampleDesc[i] + '">' +
+            '<a class="fancybox fancybox.iframe" href="examples/web/' + filterType + '/' + 'loader.html?name=' + exampleName[i] + '" title="' + exampleDesc + '">' +
-            '<img width="400" height="225" src="../examples/img/' + exampleName[i] + '.png"><div class="extext"><p>' + exampleDesc[i] + '</p></div></a>' +
+            '<img width="400" height="225" src="../examples/web/' + filterType + '/' + exampleName[i] + '.png"><div class="extext"><p>' + exampleDesc + '</p></div></a>' +
             '</div>');
 
         $('#container a .extext').hide();

docs/common/js/games.js

@@ -16,7 +16,6 @@ $(document).ready(function() {
         'sample_tetris',
         'sample_gold_fever',
         'sample_doom',
-        'game_raylib_features',
         'game_drturtle',
         'game_just_do',
         'game_skully_escape',
@@ -42,7 +41,6 @@ $(document).ready(function() {
         'tetris',
         'gold fever',
         'doom',
-        'raylib Features DEMO',
         'Dr Turtle & Mr Gamera',
         'JUST DO',
         'Skully Escape',
@@ -83,8 +81,6 @@ $(document).ready(function() {
             */
         }
         
-        if (exampleName[i] == 'game_koala_seasons') linkTag = '<a target="_blank" href="http://www.koalaseasons.com" title="' + exampleDesc[i] + '">';
-
         $('#container').append(
             '<div class="mix f' + filterType + '">' + linkTag +
             '<img width="400" height="225" src="../games/img/' + exampleName[i] + '.png"><div class="extext"><p>' + exampleDesc[i] + '</p></div></a>' +