A teasing guy: have i been friend-zoned?

Well there is this guy in my cl that has been "annoying"/ flirting w/me since last year. We were okay friends when he started hitting me constantly and playing w/my hair/punching/etc. We had a huge fight and then we got back and he told me he really cares/it hurts him to see me down/etc. He kept pestering my friend when he saw my crying and kept txt her to ask if i was okay/why i was mad. We play around a lot and he still hits me and makes fun of me. Our teachers even know we like each other bc we are so obvious. Everyone thinks he's flirting with me. but recently he's gotten really mean like "ur ugly" or "ur fat" and "ur not getting a date to prom". He even vowed to counsel my prom date bc someone who wants to take me has something wrong with his head. I dont get him. I know this has been asked a million times but does this guy like me? He doesn't tease other girls btw.