Merge branch 'dev'

Author: JujuAdams

README.md

@@ -1,5 +1,5 @@
 <p align="center"><img src="https://raw.githubusercontent.com/JujuAdams/input/master/LOGO.png" style="display:block; margin:auto; width:300px"></p>
-<h1 align="center">Input 5.1.2</h1>
+<h1 align="center">Input 5.2.0 beta 3</h1>
 
 <p align="center">Comprehensive cross-platform input for GameMaker Studio 2022.5 by <a href="http://www.jujuadams.com/"><b>@jujuadams</b></a> and <a href="https://offalynne.neocities.org/"><b>@offalynne</b></a></p>
 

animcurves/curve_test_vibration/curve_test_vibration.yy

@@ -1,4 +1,9 @@
+if (INPUT_MULTIPLAYER_ABORT_CALLBACK == undefined)
+{
+    __input_error("INPUT_MULTIPLAYER_ABORT_CALLBACK must be defined for this test case");
+}
+
 //Start the JOIN source mode
 //This automatically assigns sources to players as they join the game by pressing something on a gamepad/keyboard/mouse
 input_source_mode_set(INPUT_SOURCE_MODE.JOIN);
-input_multiplayer_params_set(2, 2);
+input_multiplayer_params_set(2, 2);

datafiles/controllertypes.csv

@@ -13,7 +13,7 @@ if (!input_player_connected(0))
 }
 else
 {
-    _string += "Player 1: Joined (press " + input_binding_get_icon(input_binding_get("cancel", 0)) + " to leave)\n";
+    _string += "Player 1: Joined (press " + input_binding_get_icon(input_binding_get("cancel", 0), 0) + " to leave)\n";
     _string += "Using " + (input_source_using(INPUT_GAMEPAD, 0)? input_gamepad_get_description(input_player_get_gamepad(0)) : "keyboard + mouse") + "\n";
     _string += "\n";
 
@@ -25,7 +25,7 @@ else
     }
     else
     {
-        _string += "Player 2: Joined (press " + input_binding_get_icon(input_binding_get("cancel", 1)) + " to leave)\n";
+        _string += "Player 2: Joined (press " + input_binding_get_icon(input_binding_get("cancel", 1), 1) + " to leave)\n";
         _string += "Using " + (input_source_using(INPUT_GAMEPAD, 1)? input_gamepad_get_description(input_player_get_gamepad(1)) : "keyboard + mouse") + "\n";
         _string += "\n";
     }

datafiles/sdl2.txt

@@ -9,12 +9,8 @@ if (pause)
     //Only allow the player to navigate the menu if we're not rebinding anything
     if (!input_binding_scan_in_progress())
     {
-        //Move the menu selection up and down...
-        menu_selection += input_check_pressed("down");
-        menu_selection -= input_check_pressed("up");
-        
-        //...and also here's a bonus example for how to use input_check_repeat_opposing()!
-        menu_selection += input_check_repeat_opposing("up", "down");
+        //Move the menu selection up and down, example for how to use 'opposing' checkers
+        menu_selection += input_check_opposing_pressed("up", "down") + input_check_opposing_repeat("up", "down");
 
         //Make sure we wrap around the menu
         menu_selection = (menu_selection + 5) mod 5;

input.yyp

@@ -1,3 +1,5 @@
+draw_set_color(input_window_has_focus()? c_white : c_gray);
+
 var _string = "";
 
 _string += "Gamepad " + string(test_index) + " of " + string(gamepad_get_device_count()) + ", \"" + string(gamepad_get_description(test_index)) + "\"\n\n";

objects/obj_example_mp_join/Create_0.gml

@@ -4,9 +4,6 @@ if (INPUT_MULTIPLAYER_ABORT_CALLBACK == undefined) __input_error("INPUT_MULTIPLA
 input_source_mode_set(INPUT_SOURCE_MODE.JOIN);
 input_multiplayer_params_set(2, INPUT_MAX_PLAYERS);
 
-input_mouse_capture_set(true);
-window_set_cursor(cr_none);
-
 input_cursor_elastic_set(room_width/2, room_height/2, 0.5, all);
 input_cursor_set(room_width/2, room_height/2, all);
 input_cursor_limit_circle(room_width/2, room_height/2, 200, all);