Merge branch 'master' of github.com:libretro/RetroArch into nav

Conflicts: pkg/emscripten/proto.html
2025-03-29 22:20:21 +00:00 · 2016-09-11 00:32:18 -04:00 · 2016-09-11 00:32:18 -04:00 · ed44348b44
commit ed44348b44
parent 6ee2689bb6 457ea6c77f
9 changed files with 56 additions and 15060 deletions
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@ -5646,12 +5646,12 @@ static bool setting_append_list(
 #endif
         break;
      case SETTINGS_LIST_CORE_UPDATER:
-#ifdef HAVE_NETWORKING
         START_GROUP(list, list_info, &group_info,
               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS),
               parent_group);
         parent_group = msg_hash_to_str(MENU_ENUM_LABEL_UPDATER_SETTINGS);
         START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group);
+#ifdef HAVE_NETWORKING

         CONFIG_STRING(
               list, list_info,
@ -5699,25 +5699,24 @@ static bool setting_append_list(
               SD_FLAG_NONE
               );
         menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE);
-
+#endif
         END_SUB_GROUP(list, list_info, parent_group);
         END_GROUP(list, list_info, parent_group);
-#endif
         break;
      case SETTINGS_LIST_NETPLAY:
+         START_GROUP(list, list_info, &group_info,
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS),
+               parent_group);
+
+         parent_group = msg_hash_to_str(MENU_ENUM_LABEL_NETWORK_SETTINGS);
+
+         START_SUB_GROUP(list, list_info, "Netplay", &group_info, &subgroup_info, parent_group);
+
         {
+#ifdef HAVE_NETPLAY
 #if defined(HAVE_NETWORK_CMD)
            unsigned user;
 #endif
-#ifdef HAVE_NETPLAY
-            START_GROUP(list, list_info, &group_info,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS),
-                  parent_group);
-
-            parent_group = msg_hash_to_str(MENU_ENUM_LABEL_NETWORK_SETTINGS);
-
-            START_SUB_GROUP(list, list_info, "Netplay", &group_info, &subgroup_info, parent_group);
-
            CONFIG_BOOL(
                  list, list_info,
                  &global->netplay.enable,
@ -5945,10 +5944,10 @@ static bool setting_append_list(
                  SD_FLAG_ADVANCED);
            menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_STDIN_CMD_ENABLE);
 #endif
-            END_SUB_GROUP(list, list_info, parent_group);
-            END_GROUP(list, list_info, parent_group);
 #endif
         }
+         END_SUB_GROUP(list, list_info, parent_group);
+         END_GROUP(list, list_info, parent_group);
         break;
      case SETTINGS_LIST_LAKKA_SERVICES:
         {
--- a/pkg/emscripten/.gitignore
+++ b/pkg/emscripten/.gitignore
@ -0,0 +1,3 @@
+media
+*_libretro.js
+*_libretro.js.mem
--- a/pkg/emscripten/browserfs.js
+++ b/pkg/emscripten/browserfs.js
--- a/pkg/emscripten/browserfs.js.map
+++ b/pkg/emscripten/browserfs.js.map
--- a/pkg/emscripten/browserfs.min.js.map
+++ b/pkg/emscripten/browserfs.min.js.map
--- a/pkg/emscripten/proto.css
+++ b/pkg/emscripten/proto.css
@ -15,6 +15,7 @@
 * Webplayer Preview when not loaded.
 */
 .webplayer-preview {
+  margin: 0 auto;
  cursor: wait;
  opacity: 0.2;
  transition: all 0.8s;
@ -29,6 +30,22 @@
  -moz-animation: loaded 0.8s ease-in-out;
  animation: loaded 0.8s ease-in-out;
 }
+@keyframes loaded {
+  from {
+    opacity: 0.2;
+  }
+  to {
+    opacity: 1;
+  }
+}
+@-moz-keyframes loaded {
+  from {
+    opacity: 0.2;
+  }
+  to {
+    opacity: 1;
+  }
+}
@-webkit-keyframes loaded {
  from {
    opacity: 0.2;
@ -37,6 +54,22 @@
    opacity: 1;
  }
 }
+@keyframes loading{
+  from {
+    opacity: 0.2;
+  }
+  to {
+    opacity: 0.35;
+  }
+}
+@-moz-keyframes loading{
+  from {
+    opacity: 0.2;
+  }
+  to {
+    opacity: 0.35;
+  }
+}
@-webkit-keyframes loading {
  from {
    opacity: 0.2;
@ -54,21 +87,6 @@ canvas.webplayer {
  outline: none;
 }

-.fa.spinning {
-    animation: spin 1s infinite linear;
-    -webkit-animation: spin2 1s infinite linear;
-}
-
-@keyframes spin {
-    from { transform: scale(1) rotate(0deg); }
-    to { transform: scale(1) rotate(360deg); }
-}
-
-@-webkit-keyframes spin2 {
-    from { -webkit-transform: rotate(0deg); }
-    to { -webkit-transform: rotate(360deg); }
-}
-
 textarea {
    font-family: monospace;
    font-size: 0.7em;
--- a/pkg/emscripten/proto.html
+++ b/pkg/emscripten/proto.html
@ -88,7 +88,7 @@
                       </div>

                      <button class="btn btn-primary disabled" id="btnRun" onclick="startRetroArch()">
-                         <span class="fa fa-spinner spinning" id="icnRun"></span> Run
+                         <span class="fa fa-spinner fa-spin" id="icnRun"></span> Run
                      </button>
                      <button class="btn btn-primary disabled" id="btnAdd" onclick="document.getElementById('btnRom').click()">
                         <span class="fa fa-plus" id="icnAdd"></span> Add Content
@ -108,7 +108,7 @@
      <div class="container">
         <div class="webplayer_border text-xs-center" id="canvas_div">
            <canvas class="webplayer col-xs-12" id="canvas" tabindex="1" oncontextmenu="event.preventDefault()" style="display: none"></canvas>
-            <img class="webplayer-preview img-fluid" src="media/canvas.png" width="900px" height="675px" alt="RetroArch Logo">
+            <img class="webplayer-preview img-fluid" src="media/canvas.png" width="960px" height="720px" alt="RetroArch Logo">
         </div>
      </div>
   </div>
@ -152,7 +152,7 @@
   <script src="//cdnjs.cloudflare.com/ajax/libs/dropbox.js/0.10.2/dropbox.min.js"></script>
   <script src="https://use.fontawesome.com/bb20806e1e.js"></script>
   <script src="analytics.js"></script>
-   <script src="browserfs.min.js"></script>
+   <script src="//wzrd.in/standalone/browserfs@0.6.1"></script>
   <script src="proto.js"></script>
 </body>
 </html>
--- a/pkg/emscripten/proto.js
+++ b/pkg/emscripten/proto.js
@ -50,7 +50,7 @@ function dropboxInit()
  document.getElementById('btnRun').disabled = true;
  document.getElementById('btnDrop').disabled = true;
  $('#icnDrop').removeClass('fa-dropbox');
-  $('#icnDrop').addClass('fa-spinner spinning');
+  $('#icnDrop').addClass('fa-spinner fa-spin');
  

  client.authDriver(new Dropbox.AuthDriver.Redirect());
@ -66,7 +66,7 @@ function dropboxInit()
 function success()
 {
  document.getElementById('btnRun').disabled = false;
-  $('#icnDrop').removeClass('fa-spinner spinning');
+  $('#icnDrop').removeClass('fa-spinner').removeClass('fa-spin');
  $('#icnDrop').addClass('fa-check');
  console.log("WEBPLAYER: Sync successful");
  setupFileSystem("dropbox");
@ -311,7 +311,7 @@ $(function() {

    // Activate the Start RetroArch button.
    $('#btnRun').removeClass('disabled');
-    $('#icnRun').removeClass('fa-spinner spinning');
+    $('#icnRun').removeClass('fa-spinner').removeClass('fa-spin');
    $('#icnRun').addClass('fa-play');

    if (localStorage.getItem("backend") == "dropbox")
--- a/pkg/emscripten/webplayer.html
+++ b/pkg/emscripten/webplayer.html
@ -132,7 +132,7 @@
   <script src="//cdnjs.cloudflare.com/ajax/libs/tether/1.3.4/js/tether.min.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.3/js/bootstrap.min.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/dropbox.js/0.10.2/dropbox.min.js"></script>
-   <script src="browserfs.js"></script>
+   <script src="//wzrd.in/standalone/browserfs@0.6.1"></script>
   <script src="webplayer.js"></script>
 </body>
 </html>