Merge branch 'master' into tumble-changes

src/g_game.c

@@ -925,9 +925,14 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	turnleft = PlayerInputDown(ssplayer, gc_turnleft);
 
 	joystickvector.xaxis = PlayerJoyAxis(ssplayer, AXISTURN);
-	joystickvector.yaxis = PlayerJoyAxis(ssplayer, AXISAIM);
 	G_HandleAxisDeadZone(forplayer, &joystickvector);
 
+	// For kart, I've turned the aim axis into a digital axis because we only
+	// use it for aiming to throw items forward/backward and the vote screen
+	// This mean that the turn axis will still be gradient but up/down will be 0
+	// until the stick is pushed far enough
+	joystickvector.yaxis = PlayerJoyAxis(ssplayer, AXISAIM);
+
 	if (encoremode)
 	{
 		turnright ^= turnleft; // swap these using three XORs

src/g_game.h

@@ -102,7 +102,6 @@ typedef enum
 	AXISTURN,
 	AXISMOVE,
 	AXISBRAKE,
-	AXISAIM,
 	AXISLOOK,
 
 	AXISDIGITAL, // axes below this use digital deadzone
@@ -110,6 +109,7 @@ typedef enum
 	AXISFIRE = AXISDIGITAL,
 	AXISDRIFT,
 	AXISLOOKBACK,
+	AXISAIM,
 } axis_input_e;
 
 INT32 PlayerJoyAxis(UINT8 player, axis_input_e axissel);