Merge branch 'develop' of https://github.com/blitz-research/monkey2 into develop

bananas/gamecontroller/gamecontroller.monkey2

@@ -43,15 +43,15 @@ Class Player
 		
 		For Local i:=0 Until 6
 			Local axis:=Cast<GameControllerAxis>( i )
-			Local name:="axis"+i'GameController.GetAxisName( axis )
+			Local name:="A"+i'GameController.GetAxisName( axis )
 			Local v:=Format( controller.GetAxis( axis ) )
-			canvas.DrawText( name+"="+v,i * 104,32 )
+			canvas.DrawText( name+"="+v,i * 80,32 )
 		Next
 		
 		For Local i:=0 Until 15
 			Local button:=Cast<GameControllerButton>( i )
-			Local name:="b"+i'"GameController.GetButtonName( button )
-			canvas.DrawText( name+"="+Int( controller.GetButton( button ) ),(i Mod 10)*56,(i/10)*16+48 )
+			Local name:="B"+i'"GameController.GetButtonName( button )
+			canvas.DrawText( name+"="+Int( controller.GetButton( button ) ),(i Mod 8)*80,(i/8)*16+48 )
 		Next
 			
 	End

bananas/joystick/joystick.monkey2

@@ -49,11 +49,11 @@ Class Player
 		
 		For Local axis:=0 Until 6
 			Local v:=Format( joystick.GetAxis( axis ) )
-			canvas.DrawText( "axis"+axis+"="+v,axis * 104,48 )
+			canvas.DrawText( "A"+axis+"="+v,axis * 80,48 )
 		Next
 		
-		For Local button:=0 Until 10
-			canvas.DrawText( "b"+button+"="+Int( joystick.ButtonDown( button ) ),button*56,64 )
+		For Local button:=0 Until 15
+			canvas.DrawText( "B"+button+"="+Int( joystick.ButtonDown( button ) ),(button Mod 8)*80,(button/8)*16+64 )
 		Next
 			
 	End