Merge pull request #456 from hizzlekizzle/master

updated analogs to be moveable

media/overlays/dual-shock/dual-shock.cfg

@@ -22,7 +22,7 @@ overlay3_full_screen = true
 overlay3_range_mod = 1.5
 overlay3_alpha_mod = 2.0
 
-overlay0_descs = 23
+overlay0_descs = 25
 overlay0_desc0 = "left,0.04375,0.352083333333,radial,0.0525,0.0875"
 overlay0_desc0_overlay = dpad-left.png
 overlay0_desc1 = "right,0.19375,0.352083333333,radial,0.0525,0.0875"
@@ -63,14 +63,22 @@ overlay0_desc19_overlay = rgui.png
 overlay0_desc20 = "overlay_next,0.40125,0.11708333333334,radial,0.025,0.04166666666"
 overlay0_desc20_overlay = rotate.png
 overlay0_desc20_next_target = "portrait"
-overlay0_desc21 = "analog_left,0.28845,0.75208333333,radial,0.127575,0.212625"
-overlay0_desc21_overlay = thumbstick.png
-overlay0_desc21_pct = 0.85
-overlay0_desc22 = "analog_right,0.71845,0.75208333333,radial,0.127575,0.212625"
-overlay0_desc22_overlay = thumbstick.png
-overlay0_desc22_pct = 0.85
+overlay0_desc23 = "analog_left,0.28845,0.75208333333,radial,0.083,0.136"
+overlay0_desc23_overlay = thumbstick-pad.png
+overlay0_desc23_range_mod = 1.5
+overlay0_desc23_pct = 0.75
+overlay0_desc23_movable = true
+overlay0_desc24 = "analog_right,0.71845,0.75208333333,radial,0.083,0.136"
+overlay0_desc24_overlay = thumbstick-pad.png
+overlay0_desc24_range_mod = 1.5
+overlay0_desc24_pct = 0.75
+overlay0_desc24_movable = true
+overlay0_desc21 = "nul,0.71845,0.75208333333,radial,0.127575,0.212625"
+overlay0_desc21_overlay = thumbstick-background.png
+overlay0_desc22 = "nul,0.28845,0.75208333333,radial,0.127575,0.212625"
+overlay0_desc22_overlay = thumbstick-background.png
 
-overlay1_descs = 23
+overlay1_descs = 25
 overlay1_desc0 = "left,0.072916666667,0.55025,radial,0.08208333333,0.0555"
 overlay1_desc0_overlay = dpad-left.png
 overlay1_desc1 = "right,0.322916666667,0.55025,radial,0.08208333333,0.0555"
@@ -111,12 +119,20 @@ overlay1_desc19_overlay = rgui.png
 overlay1_desc20 = "overlay_next,0.30125,0.03125,radial,0.04166666666,0.025"
 overlay1_desc20_overlay = rotate.png
 overlay1_desc20_next_target = "landscape"
-overlay1_desc21 = "analog_left,0.24845,0.84845,radial,0.212625,0.127575"
-overlay1_desc21_overlay = thumbstick.png
-overlay1_desc21_pct = 0.85
-overlay1_desc22 = "analog_right,0.75208333333,0.84845,radial,0.212625,0.127575"
-overlay1_desc22_overlay = thumbstick.png
-overlay1_desc22_pct = 0.85
+overlay1_desc23 = "analog_left,0.24845,0.84845,radial,0.136,0.083"
+overlay1_desc23_overlay = thumbstick-pad.png
+overlay1_desc23_range_mod = 1.5
+overlay1_desc23_pct = 0.75
+overlay1_desc23_movable = true
+overlay1_desc24 = "analog_right,0.71845,0.84845,radial,0.136,0.083"
+overlay1_desc24_overlay = thumbstick-pad.png
+overlay1_desc24_range_mod = 1.5
+overlay1_desc24_pct = 0.75
+overlay1_desc24_movable = true
+overlay1_desc21 = "nul,0.71845,0.84845,radial,0.212625,0.127575"
+overlay1_desc21_overlay = thumbstick-background.png
+overlay1_desc22 = "nul,0.24845,0.84845,radial,0.212625,0.127575"
+overlay1_desc22_overlay = thumbstick-background.png
 
 overlay2_descs = 11
 overlay2_desc0 = "load_state,270,90,rect,120,30"

media/overlays/n64/n64.cfg

@@ -30,7 +30,7 @@ overlay5_full_screen = true
 overlay5_range_mod = 1.5
 overlay5_alpha_mod = 2.0
 
-overlay0_descs = 14
+overlay0_descs = 15
 overlay0_desc0 = "start,0.498,0.8,radial,0.0375,0.0625"
 overlay0_desc0_overlay = start.png
 overlay0_desc1 = "r2|b,0.83625,0.68333333333,radial,0.0325,0.05416666666667"
@@ -52,9 +52,11 @@ overlay0_desc8_overlay = r.png
 overlay0_desc9 = "overlay_next,0.5,0.94533333333,rect,0.0234375,0.04166666667"
 overlay0_desc9_overlay = next.png
 overlay0_desc9_next_target = "menu"
-overlay0_desc10 = "analog_left,0.16845,0.70208333333,radial,0.127575,0.212625"
-overlay0_desc10_overlay = analog.png
-overlay0_desc10_pct = 1.0
+overlay0_desc14 = "analog_left,0.16845,0.70208333333,radial,0.083,0.136"
+overlay0_desc14_overlay = thumbstick-pad.png
+overlay0_desc14_range_mod = 1.5
+overlay0_desc14_pct = 0.75
+overlay0_desc14_movable = true
 overlay0_desc11 = "menu_toggle,0.5,0.11708333333334,radial,0.025,0.04166666666"
 overlay0_desc11_overlay = rgui.png
 overlay0_desc12 = "overlay_next,0.30125,0.11708333333334,radial,0.025,0.04166666666"
@@ -63,6 +65,8 @@ overlay0_desc12_next_target = "analog-portrait"
 overlay0_desc13 = "overlay_next,0.70125,0.11708333333334,radial,0.025,0.04166666666"
 overlay0_desc13_overlay = digital-icon.png
 overlay0_desc13_next_target = "digital-landscape"
+overlay0_desc10 = "nul,0.16845,0.70208333333,radial,0.127575,0.212625"
+overlay0_desc10_overlay = thumbstick-background.png
 
 overlay1_descs = 22
 overlay1_desc0 = "left,0.09375,0.70208333333,radial,0.0525,0.0875"
@@ -105,7 +109,7 @@ overlay1_desc20_overlay = l.png
 overlay1_desc21 = "r,0.9375,0.052083333333,rect,0.0625,0.052083333333"
 overlay1_desc21_overlay = r.png
 
-overlay2_descs = 14
+overlay2_descs = 15
 overlay2_desc0 = "start,0.495,0.68625,radial,0.0625,0.0375"
 overlay2_desc0_overlay = start.png
 overlay2_desc1 = "r2|b,0.82,0.82,radial,0.04375,0.02625"
@@ -123,14 +127,10 @@ overlay2_desc6_overlay = rightc.png
 overlay2_desc7 = "overlay_next,0.50125,0.95833333333,rect,0.04166666666,0.0234375"
 overlay2_desc7_overlay = next.png
 overlay2_desc7_next_target = "menu"
-overlay2_desc8 = "analog_left,0.21875,0.82275,radial,0.21,0.13"
-overlay2_desc8_overlay = analog.png
-overlay2_desc8_pct = 1.0
 overlay2_desc9 = "menu_toggle,0.50125,0.57708333333334,radial,0.04166666666,0.025"
 overlay2_desc9_overlay = rgui.png
-overlay2_desc10 = "overlay_next,0.30125,0.57708333333334,radial,0.04166666666,0.025"
-overlay2_desc10_overlay = rotate.png
-overlay2_desc10_next_target = "analog-landscape"
+overlay2_desc8 = "nul,0.21875,0.82275,radial,0.21,0.13"
+overlay2_desc8_overlay = thumbstick-background.png
 overlay2_desc11 = "overlay_next,0.70125,0.57708333333334,radial,0.04166666666,0.025"
 overlay2_desc11_overlay = digital-icon.png
 overlay2_desc11_next_target = "digital-portrait"
@@ -138,6 +138,14 @@ overlay2_desc12 = "l2,0.0625,0.552083333333,rect,0.0925,0.032083333333"
 overlay2_desc12_overlay = z.png
 overlay2_desc13 = "r,0.9375,0.552083333333,rect,0.0925,0.032083333333"
 overlay2_desc13_overlay = r.png
+overlay2_desc10 = "analog_left,0.21875,0.82275,radial,0.136,0.083"
+overlay2_desc10_overlay = thumbstick-pad.png
+overlay2_desc10_range_mod = 1.5
+overlay2_desc10_pct = 0.75
+overlay2_desc10_movable = true
+overlay2_desc14 = "overlay_next,0.30125,0.57708333333334,radial,0.04166666666,0.025"
+overlay2_desc14_overlay = rotate.png
+overlay2_desc14_next_target = "analog-landscape"
 
 overlay3_descs = 22
 overlay3_desc0 = "left,0.09375,0.81875,radial,0.0875,0.0525"