What happened to my shoulder?

I was riding today and I hit the water in a akward way and my shoulder felt stuck in this weird position, It was sticking out but it felt like it was sitting lower than normal. I popped it back to where it needed to be and I was fine.

The thing I'm confused about is I'm fairly certain shoulder dislocations are very painful and the only pain I had was when it felt out of place. It felt fine when I popped it back but it just feels really sore now. Did I halfway dislocate it or something?

I should mention I had to stop working out a few weeks ago cuz my shoulder started hurting pretty bad. I thought lifting weights was supposed to help my joints and muscles not make them worse.