Merge branch 'redesign' into develop

Author: danielzting

levels/bogo_sort.gd

@@ -1,8 +1,10 @@
 """
 BOGOSORT
 
+
 Generates random permutations until the array is sorted.
 
+
 Keep on hitting RIGHT ARROW to CONTINUE and hope for the best!
 """
 

levels/bubble_sort.gd

@@ -1,12 +1,14 @@
 """
 BUBBLE SORT
 
+
 Bubble sort iterates through the array and looks at each pair of
 elements, swapping them if they are out of order. When it has gone
 through the entire array without swapping a single pair, it has
 finished. Though simple to understand, bubble sort is hopelessly
 inefficient on all but the smallest of arrays.
 
+
 If the two highlighted elements are out of order, hit LEFT ARROW to swap
 them. Otherwise, hit RIGHT ARROW to continue.
 """

levels/cocktail_sort.gd

@@ -1,9 +1,11 @@
 """
 COCKTAIL SORT
 
+
 Cocktail shaker sort is a variation of bubble sort that
 alternates going backwards and forwards.
 
+
 If the two highlighted elements are out of order, hit LEFT ARROW to swap
 them. Otherwise, hit RIGHT ARROW to continue.
 """

levels/comb_sort.gd

@@ -1,8 +1,10 @@
 """
 COMB SORT
 
+
 Comb sort is a variant of bubble sort that operates on gapped arrays.
 
+
 If the two highlighted elements are out of order, hit LEFT ARROW to swap
 them. Otherwise, hit RIGHT ARROW to continue.
 """

levels/comparison_sort.gd

@@ -11,9 +11,9 @@ const EFFECTS = {
 }
 
 const DISABLE_TIME = 1.0
-var NAME = _get_header().split("  ")[0]
-var DESCRIPTION = _get_header().split("  ")[1]
-var CONTROLS = _get_header().split("  ")[2]
+var NAME = _get_header().split("   ")[0]
+var DESCRIPTION = _get_header().split("   ")[1]
+var CONTROLS = _get_header().split("   ")[2]
 
 var array: ArrayModel
 

levels/cycle_sort.gd

@@ -1,10 +1,12 @@
 """
 CYCLE SORT
 
+
 Cycle sort repeatedly counts the number of elements less than the first
 and swaps it with that index until the smallest element is reached. Then
 it does this process starting at the next out-of-place element.
 
+
 If the highlighted element is less than the pointer, hit LEFT ARROW.
 Otherwise, hit RIGHT ARROW.
 """

levels/insertion_sort.gd

@@ -1,12 +1,14 @@
 """
 INSERTION SORT
 
+
 Insertion sort goes through the array and inserts each
 element into its correct position. It is most similar to how most people
 would sort a deck of cards. It is also slow on large arrays but it is
 one of the faster quadratic algorithms. It is often used to sort smaller
 subarrays in hybrid sorting algorithms.
 
+
 Hit LEFT ARROW to swap the two highlighted elements as long as they are
 out of order. When this is no longer the case, hit RIGHT ARROW to
 advance.

levels/merge_sort.gd

@@ -1,12 +1,14 @@
 """
 MERGE SORT
 
+
 Merge sort is an efficient sorting algorithm that splits the array into
 single-element chunks. Then it merges each pair of chunks until only one
 sorted chunk is left by repeatedly choosing the smaller element at the
 head of each chunk and moving the head back. However, it needs an entire
 array's worth of auxiliary memory.
 
+
 Press the ARROW KEY corresponding to the side that the smaller
 highlighted element is on. If you've reached the end of one side, press
 the other side's ARROW KEY.

levels/odd_even_sort.gd

@@ -1,9 +1,11 @@
 """
 ODD-EVEN SORT
 
+
 Odd-even sort is a variant of bubble sort that alternates on elements at
 odd and even indices.
 
+
 If the two highlighted elements are out of order, hit LEFT ARROW to swap
 them. Otherwise, hit RIGHT ARROW to continue.
 """

levels/quick_sort.gd

@@ -1,6 +1,7 @@
 """
 QUICKSORT
 
+
 Quicksort designates the last element as the pivot and puts everything
 less than the pivot before it and everything greater after it. This
 partitioning is done by iterating through the array while keeping track
@@ -9,6 +10,7 @@ less than the pivot is encountered, it is swapped with the pointed
 element and the pointer moves forward. At the end, the pointer and pivot
 are swapped, and the process is repeated on the left and right halves.
 
+
 If the highlighted element is less than the pivot or the pivot has been
 reached, press LEFT ARROW to swap it with the pointer. Otherwise, press
 RIGHT ARROW to move on.