Permalink
Browse files

Merge commit 'refs/pull/132/head' of https://github.com/cubing/alg.cu…

  • Loading branch information...
2 parents cedb127 + 481c1c3 commit 0e7ddbc739e4688f9b7f6c00a3b58573b01ab7a5 @lgarron lgarron committed Nov 21, 2016
Showing with 10 additions and 10 deletions.
  1. +1 −1 README.md
  2. +4 −4 alg.cubing.net.js
  3. +3 −3 index.html
  4. +2 −2 searchDescription.xml
View
@@ -5,7 +5,7 @@ Built on [`alg.js`](https://github.com/cubing/alg.js) and [`twisty.js`](https://
## Examples
-- [Mats Valk's 5.55 world record](http://alg.cubing.net/?type=reconstruction&alg=x_y%27_%2F%2F_inspection%0AF_R_D_L_F_%2F%2F_cross%0AU_R_U%27_R%27_d_R%27_U_R_%2F%2F_1st_pair%0Ay_U2%27_R%27_U%27_R_%2F%2F_2nd_pair%0AU_L_U%27_L%27_d_R_U%27_R%27_%2F%2F_3rd_pair%0Ay%27_U%27_R_U_R%27_U_R_U%27_R%27_%2F%2F_4th_pair_%28OLS%29%0AR2%27_U%27_R%27_U%27_R_U_R_U_R_U%27_R_U2%27_%2F%2F_PLL&setup=D2_U%27_R2_U_F2_D2_U%27_R2_U%27_B%27_L2_R%27_B%27_D2_U_B2_L%27_D%27_R2&title=Mats%20Valk,%205.55%20WR) (reconstructed by Rob Stuart)
+- [Mats Valk's 4.74 world record](http://alg.cubing.net/?alg=x-_y-_%2F%2F_Inspection%0AL-_D_R2_%2F%2F_Cross%0AR_U-_R-_U-_L-_U-_L_%2F%2F_1st_Pair%0AU2_R_U_R-_U-_d-_R_U_R-_%2F%2F_2nd_Pair%0Ay_U2_R_U-_R-_L_U-_L-_%2F%2F_3rd_Pair%0Ay-_U2_R-_U2_R_U2_%2F%2F_4th_Pair%0AR-_U_R-_F_R_F-_U_R_%2F%2F_VLS%0AU_%2F%2F_AUF&setup=B2_F2_D_F2_L2_U_R2_B2_F2_U2_L2_B-_L2_R2_D-_U2_L2_U-_R-_F_R&type=reconstruction&title=Mats%20Valk,%205.55%20WR)
- [T-perm](http://alg.cubing.net/?title=T-Perm&alg=R_U_R-_U-_R-_F_R2_U-_R-_U-_R_U_R-_F-&stage=PLL&type=alg&view=fullscreen) (fullscreen)
- [Notation Stress Test](http://alg.cubing.net/?alg=RLUDBF_%2F%2F_Single_moves,_no_space.%0AB-_F-_D-_U-_L-_R-_%2F%2F_Inverses.%0AR_L2_R3_L2-_R5_L8-_R7_%2F%2F_Move_amount%0AU_._U_._U_._U_%2F%2F_Pauses.%0AM-_E2_S2_M_S2_E2_%2F%2F_Slice_turns.%0AM2-_U-_M2-_U2-_M2-_U-_M2-_%2F%2F_H-perm.%0Ax_y_z_%2F%2F_Rotations.%0AR2_L2_R2-_L2-_%2F%2F_Half_turns.%0ARw_r-_%2F%2F_Wide_turns.%0A4Rw_x_L-_%2F%2F_Very_wide_turns%0A2%26%2345%3B3Lw_3%26%2345%3B4r__%2F%2F_Wide_block_turns&ini=M2_U_M2_U2_M2_U_M2&name=twisty.js_Stress_Test&cube=5x5x5&setup=M2_U_M2_U2_M2_U_M2&puzzle=5x5x5&title=Stress%20Test)
View
@@ -658,12 +658,12 @@ algxControllers.controller('algxController', ["$scope", "$location", "debounce",
// TODO: Use IFs for puzzle/type
var demos = {
- "mats-5.55": {
+ "mats-4.74": {
puzzle: $scope.puzzle_map["3x3x3"],
type: $scope.type_map["reconstruction"],
- title: "Mats Valk, 5.55 WR",
- setup: "D2 U' R2 U F2 D2 U' R2 U' B' L2 R' B' D2 U B2 L' D' R2",
- alg: "x y' // inspection\nF R D L F // cross\nU R U' R' d R' U R // 1st pair\ny U2' R' U' R // 2nd pair\nU L U' L' d R U' R' // 3rd pair\ny' U' R U R' U R U' R' // 4th pair (OLS)\nR2' U' R' U' R U R U R U' R U2' // PLL"
+ title: "Mats Valk, 4.74 WR",
+ setup: "B2 F2 D F2 L2 U R2 B2 F2 U2 L2 B' L2 R2 D' U2 L2 U' R' F R",
+ alg: "x' y' // Inspection\nL' D R2 // Cross\nR U' R' U' L' U' L // 1st Pair\nU2 R U R' U' d' R U R' // 2nd Pair\ny U2 R U' R' L U' L' // 3rd Pair\ny' U2 R' U2 R U2 // 4th Pair\nR' U R' F R F' U R // VLS\nU // AUF"
},
"T-Perm": {
type: $scope.type_map["alg"],
View
@@ -6,7 +6,7 @@
<title data-ng-bind="alg | title:title">alg.cubing.net</title>
- <meta property="og:image" content="http://alg.cubing.net/social-media-image.png" />
+ <meta property="og:image" content="https://alg.cubing.net/social-media-image.png" />
<link rel="search" type="application/opensearchdescription+xml" href="searchDescription.xml" title="alg.cubing.net"/>
@@ -219,7 +219,7 @@ <h2 data-ng-bind="type.setup">Setup</h2>
<h2>Examples</h2>
<div class="section buttons" id="examples">
- <button href="" data-ng-click="demo('mats-5.55');">WR
+ <button href="" data-ng-click="demo('mats-4.74');">WR
</button><button href="" data-ng-click="demo('T-Perm');">T
</button><button href="" data-ng-click="demo('Sune');">Sune
</button><button href="" data-ng-click="demo('notation');">Notation
@@ -239,4 +239,4 @@ <h2 data-ng-bind="type.setup">Setup</h2>
</div>
</div>
</body>
-</html>
+</html>
@@ -4,5 +4,5 @@
<Description>View an alg at alg.cubing.net</Description>
<Tags>rubik alg view animation cube cubing speedsolving speedcubing reconstruction algorithm</Tags>
<Contact>web@garron.net</Contact>
- <Url type="text/html" template="http://alg.cubing.net/?alg={searchTerms}"/>
-</OpenSearchDescription>
+ <Url type="text/html" template="https://alg.cubing.net/?alg={searchTerms}"/>
+</OpenSearchDescription>

0 comments on commit 0e7ddbc

Please sign in to comment.